• R/O
  • HTTP
  • SSH
  • HTTPS

current: Commit

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


Commit MetaInfo

Revision58f4146480c07138c20560f124d882d753d0bea5 (tree)
Time2018-09-19 11:12:05
AuthorMamoru Sakaue / MwGhennndo <glmwghennndo@user...>
CommiterMamoru Sakaue / MwGhennndo

Log Message

Fixed a bug that unselected leaf ports were skipped in reinstalltion.
Fixed a bug that show commands took the negative lists oppositely.

Changes to be committed:

modified: lib/libdatabase_query.sh
modified: lib/libmain.sh
modified: lib/libreinstall.sh

Change Summary

Incremental Difference

--- a/lib/libdatabase_query.sh
+++ b/lib/libdatabase_query.sh
@@ -506,7 +506,7 @@ database_query_show_two_column_lists ()
506506 # ============= Output of "show" command for a single list =============
507507 database_query_show_single_list ()
508508 {
509- local list pkgnamedb flag_filter_skip_unchanged flag_filter_only_target flag_negative_listdb tmpflag_exists put_blankline origin matches flag pkg table
509+ local list pkgnamedb flag_filter_skip_unchanged flag_filter_only_target flag_negative_listdb tmpflag_exists put_blankline origin matches_negative matches_positive flag pkg table
510510 local currentorigin_is_alll currentorigin_is_target currentorigin_is_requires_requirements
511511 local currentorigin_is_initial_requirements currentorigin_is_requires_dependents
512512 local currentorigin_is_initial_dependents currentorigin_is_requires_requirements_complement currentorigin_is_relevant
@@ -543,27 +543,28 @@ database_query_show_single_list ()
543543 [ -n "$put_blankline" ] && message_echo
544544 while read origin
545545 do
546- matches=no
546+ matches_negative=no
547547 for negative_listdb in $flag_negative_listdb
548548 do
549549 if grep -qFx "$origin" "${DBDIR}/$negative_listdb" 2> /dev/null
550550 then
551- matches=yes
551+ matches_negative=yes
552552 break
553553 fi
554554 done
555- [ $matches = no ] && continue
555+ [ $matches_negative = yes ] && continue
556556 if [ -n "$flag_filter_skip_unchanged" -a $opt_skip_unchanged = yes ]
557557 then
558+ matches_positive=no
558559 for flag in $flag_filter_skip_unchanged
559560 do
560561 if [ -e "${DBDIR}/requires/$origin/$flag" ]
561562 then
562- matches=yes
563+ matches_positive=yes
563564 break
564565 fi
565566 done
566- [ $matches = no ] && continue
567+ [ $matches_positive = no ] && continue
567568 fi
568569 if [ -n "$flag_filter_only_target" ]
569570 then
--- 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_20180918212945
15+ MYVERSION=4.0.0+toward_4.1.0_20180919111149
1616 COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
1717 }
1818
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -862,7 +862,7 @@ reinstall_exec_chk_skip ()
862862 reinstall_skip 'Skipped because being irrelevant'
863863 return 1
864864 fi
865- reinstall_skip_if_in_a_list 'Skipped because being a leaf port' leaf_ports_to_delete && return 1
865+ reinstall_skip_if_in_a_list 'Skipped because being a leaf port' leaf_ports_to_delete.selected && return 1
866866 rm -f "$REINSTALL_DBNODE_DIR/this_is_skipped_build_requirement"
867867 if expr "$REINSTALL_CURRENTPKG" : '.* .*' > /dev/null
868868 then
Show on old repository browser