• R/O
  • HTTP
  • SSH
  • HTTPS

current: Commit

This is for active development.
New funtionalities are to be added actively.


Commit MetaInfo

Revision2e57a08c002a61f2a49cd84ed522f1022ff9f2c0 (tree)
Time2018-09-11 15:50:53
AuthorMamoru Sakaue / MwGhennndo <glmwghennndo@user...>
CommiterMamoru Sakaue / MwGhennndo

Log Message

Fixed a bug that the list of reinstallation became messy because of possible insertion of blank lines in requirements list.

Removed a confusing message at the end about ignorance of unrelated ports.

Changes to be committed:

modified: lib/libdatabase_build.sh
modified: lib/libmain.sh
modified: lib/libmessage.sh

Change Summary

Incremental Difference

--- a/lib/libdatabase_build.sh
+++ b/lib/libdatabase_build.sh
@@ -933,7 +933,7 @@ database_build_get_complete_recursive_dependency ()
933933 mv "$tmppath.parents.tmp" "$tmppath.parents"
934934 if [ ! -e "$dstfile" ]
935935 then
936- sort -u "$dstfile_tmp" > $dstfile
936+ sort -u "$dstfile_tmp" | grep -v '^$' > $dstfile
937937 rm "$dstfile_tmp"
938938 fi
939939 fi
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
1212 MYVERSION=4.1.0
1313 COMPATIBLE_VERSIONS='^(4\.[1]\.[0-9])$'
1414 # Template for development versions
15- MYVERSION=4.0.0+toward_4.1.0_20180910134301
15+ MYVERSION=4.0.0+toward_4.1.0_20180911145019
1616 COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
1717 }
1818
--- a/lib/libmessage.sh
+++ b/lib/libmessage.sh
@@ -211,11 +211,12 @@ message_summary_dependents_of_failed_reinstallation ()
211211 comment=$2
212212 tmpmsg=${TMPDIR}/message_summary_dependents_of_failed_reinstallation::message
213213 database_query_show_single_list_exec "$subject" \
214- `options_get_dependency_type` `options_get_dependency_level` > $tmpmsg || return 0
214+ `options_get_dependency_type` `options_get_dependency_level` > $tmpmsg.out 2> $tmpmsg.err || return 0
215215 [ $opt_batch_mode = yes ] && return 1
216216 ncolumns=`misc_get_console_column_size`
217217 message_echo '****************'
218- message_cat "$tmpmsg"
218+ message_cat "$tmpmsg.err" >&2
219+ message_cat "$tmpmsg.out"
219220 if [ -n "$comment" -a -e "$comment" ]
220221 then
221222 message_echo '****************'
Show on old repository browser