From 0b89dd392fe06c73c40a5f0c5f49a2d9b812cf11 Mon Sep 17 00:00:00 2001 From: slakmagik Date: Thu, 20 May 2010 18:35:31 +0000 Subject: [PATCH] Modified get_source_names() to fix remove_obsolete_sources(). remove_obsolete_sources() uses data from get_source_names() to determine whether a source is obsolete or not and was missing at least one atypical package. Thanks to Chess for discussion and review. Incidentally, this revision also finishes reordering the menu I started to reorder in r771. It also tweaks the ChangeLog beyond just noting this revision. --- ChangeLog-current.txt | 7 +++++-- src/usr/sbin/sbopkg | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog-current.txt b/ChangeLog-current.txt index 06195da..e3fb8c0 100644 --- a/ChangeLog-current.txt +++ b/ChangeLog-current.txt @@ -17,8 +17,11 @@ enhancements: to documentation and other resources. * Added an option to print the version of sbopkg. We try not to change the meaning of flags but note that this does change what was the '-v' flag to - '-V' and now uses '-v' for its customary 'version' purpose. + '-V' and now uses '-v' for its customary 'version' purpose. Note that the + new -V flag now accepts a '?' argument (sbopkg -V ?) which will display + the list of valid repositories. * Tweak the logic re determining ARCH and modify some ARCH-related evals and conditionals in check_for_updates and info_item. + * Fixed a bug which could result in some sources being missed when checking + for obsolete sources. +--------------------------+ - diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg index 46c720b..10c0f50 100755 --- a/src/usr/sbin/sbopkg +++ b/src/usr/sbin/sbopkg @@ -2691,6 +2691,9 @@ get_source_names() { # than in the actual tarball SRCNAME=${DL//%\/download} SRCNAME=${SRCNAME##*/} + # this is actually so that calcurse will make it to + # remove_obsolete_sources() + SRCNAME=$(sed 's/?e=.*$//;s/?format=.*$//;s/^.*?//' <<< "$SRCNAME") # Replace URI hex sequences (like %20 for ' ' and %2B for '+') with # their corresponding characters. # This is done by replacing '%' with '\x' and passing the string to @@ -3543,12 +3546,12 @@ use_options() { echo 'Saved "Build with your saved options"' >> $OPTLIST OPTIONS_MSG="\nSaved options:\n$TMPOPTIONS\n" fi - echo 'None "Build with no options"' >> $OPTLIST if [[ $LDOPTIONS ]]; then echo 'Queuefile "Build with the queuefile options"' \ >> $OPTLIST OPTIONS_MSG+="\nQueuefile options:\n$LDOPTIONS\n" fi + echo 'None "Build with no options"' >> $OPTLIST dialog --title 'Build options' --menu "$(crunch "One or \ more build option files for the $OPTAPP \ SlackBuild were found.\n$OPTIONS_MSG\nPlease choose \