diff options
| author | dougb <dougb@FreeBSD.org> | 2008-06-13 04:33:04 +0800 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2008-06-13 04:33:04 +0800 |
| commit | 00aa83b794ea5a24faf56cb01688f854e6fe3fce (patch) | |
| tree | ad48b31fa4c5f0856ca7d829504f71f56d4cc8ab /ports-mgmt | |
| parent | 36f98f6e6549698276d696e5faecbc9ec1b5b52d (diff) | |
| download | freebsd-ports-gnome-00aa83b794ea5a24faf56cb01688f854e6fe3fce.tar.gz freebsd-ports-gnome-00aa83b794ea5a24faf56cb01688f854e6fe3fce.tar.zst freebsd-ports-gnome-00aa83b794ea5a24faf56cb01688f854e6fe3fce.zip | |
Bug Fixes
=========
1. Fix -a mode by moving the update of CONFIG_SEEN_LIST to after the port
has been checked for available updates. The old way worked as a side
effect to one of the things I fixed in version 2.4. This is probably
how it should have been done all along, but since the old way worked
I was hesitant to change it.
2. Now that we are using a different format for the INSTALLED_LIST,
fix the bit that always displays the list if we are using -a.
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmaster/files/portmaster.sh.in | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/ports-mgmt/portmaster/files/portmaster.sh.in b/ports-mgmt/portmaster/files/portmaster.sh.in index 3b9136291461..879f00119e8d 100644 --- a/ports-mgmt/portmaster/files/portmaster.sh.in +++ b/ports-mgmt/portmaster/files/portmaster.sh.in @@ -122,7 +122,7 @@ kill_bad_children () { } safe_exit () { - local files p f + local files p f show_list if [ "$$" -eq "$PARENT_PID" ]; then [ -n "$DI_FILES" -o -n "$FETCH_ONLY" ] && kill_bad_children @@ -177,10 +177,18 @@ safe_exit () { ;; esac - case "$INSTALLED_LIST" in - *\\n\\t*) echo "===>>> The following actions were performed:" + if [ -n "$UPDATE_ALL" ]; then + show_list=all + else + case "$INSTALLED_LIST" in + *\\n\\t*) show_list=all ;; + *\\n) show_list=one ;; + esac + fi + case "$show_list" in + all) echo "===>>> The following actions were performed:" echo -e $INSTALLED_LIST ;; - *\\n) echo "===>>> $ilist complete" ; echo '' ;; + one) echo "===>>> $ilist complete" ; echo '' ;; esac else [ -n "$grep_deps" ] && pm_unlink $grep_deps @@ -1666,11 +1674,11 @@ all_config () { check_exclude $iport || continue - CONFIG_SEEN_LIST="${CONFIG_SEEN_LIST}${origin}:" - DEPTH= check_for_updates $iport $origin || fail 'Update failed' [ -e "$NO_DEP_UPDATES" ] || unset NO_DEP_UPDATES + + CONFIG_SEEN_LIST="${CONFIG_SEEN_LIST}${origin}:" done } ports_by_category |