diff options
| author | se <se@FreeBSD.org> | 2016-07-24 22:21:13 +0800 |
|---|---|---|
| committer | se <se@FreeBSD.org> | 2016-07-24 22:21:13 +0800 |
| commit | a417313a7bf01fc1748f015cbd0c494518ff5674 (patch) | |
| tree | 26dcf72060e2d97bd68b172fb4a7eb562fcea99f | |
| parent | b27e74b4a72b3424f9104f0754dfb5bde9fa9d29 (diff) | |
| download | freebsd-ports-gnome-a417313a7bf01fc1748f015cbd0c494518ff5674.tar.gz freebsd-ports-gnome-a417313a7bf01fc1748f015cbd0c494518ff5674.tar.zst freebsd-ports-gnome-a417313a7bf01fc1748f015cbd0c494518ff5674.zip | |
Fix "portmaster --check-port-dbdir" broken by the previous commit. While
the variable $unique_list was created with identical content, its value was
only set within the implicit sub-shell (2nd command in a pipe) and lost on
exit from the while loop.
Reported by: Jakub Laach
| -rw-r--r-- | ports-mgmt/portmaster/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/files/patch-portmaster | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index 3641519c16d9..315f4fa3baf6 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.17.9 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster index deaf4682be01..eca7f1e88be3 100644 --- a/ports-mgmt/portmaster/files/patch-portmaster +++ b/ports-mgmt/portmaster/files/patch-portmaster @@ -10,7 +10,7 @@ fi return } -@@ -1644,42 +1645,19 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then +@@ -1644,42 +1645,21 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then unique_list=':' echo "===>>> Building list of installed port names"; echo '' @@ -40,7 +40,7 @@ - [ -n "$moved_npd" ] || continue - origin=$moved_npd - fi -+ all_pkgs_by_origin | while read pkg origin; do ++ while read pkg origin; do + if [ ! -d "$pd/$origin" ]; then + find_moved_port $origin $pkg nonfatal >/dev/null + [ -n "$moved_npd" ] || continue @@ -61,7 +61,9 @@ + continue + fi + unique_list="${unique_list}`make -V UNIQUENAME -V OPTIONS_NAME | tr '\n' ':'`" -+ done ++ done <<-EOF ++ $(all_pkgs_by_origin) ++ EOF echo "===>>> Checking $port_dbdir" |