Date: Sun, 24 Jul 2016 14:21:14 +0000 (UTC) From: Stefan Esser <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419005 - in head/ports-mgmt/portmaster: . files Message-ID: <201607241421.u6OELE2t008234@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Sun Jul 24 14:21:13 2016 New Revision: 419005 URL: https://svnweb.freebsd.org/changeset/ports/419005 Log: 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 Modified: head/ports-mgmt/portmaster/Makefile head/ports-mgmt/portmaster/files/patch-portmaster Modified: head/ports-mgmt/portmaster/Makefile ============================================================================== --- head/ports-mgmt/portmaster/Makefile Sun Jul 24 13:18:46 2016 (r419004) +++ head/ports-mgmt/portmaster/Makefile Sun Jul 24 14:21:13 2016 (r419005) @@ -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}/ \ Modified: head/ports-mgmt/portmaster/files/patch-portmaster ============================================================================== --- head/ports-mgmt/portmaster/files/patch-portmaster Sun Jul 24 13:18:46 2016 (r419004) +++ head/ports-mgmt/portmaster/files/patch-portmaster Sun Jul 24 14:21:13 2016 (r419005) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607241421.u6OELE2t008234>