From e5266e2a29c56773991388ab58acf375a64de7d0 Mon Sep 17 00:00:00 2001 From: Sergey Matveychuk Date: Fri, 2 Mar 2007 20:10:08 +0000 Subject: - Fix a long standing bug when shelljoin() function wrong placed "" when more than one variables (WITH_*, WITHOUT_*) passed. --- ports-mgmt/portupgrade/Makefile | 2 +- ports-mgmt/portupgrade/files/patch-lib-pkgmisc.rb | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 ports-mgmt/portupgrade/files/patch-lib-pkgmisc.rb (limited to 'ports-mgmt') diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 0f89a5be209b..e446b29738c9 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -7,7 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 2.2.6 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/ports-mgmt/portupgrade/files/patch-lib-pkgmisc.rb b/ports-mgmt/portupgrade/files/patch-lib-pkgmisc.rb new file mode 100644 index 000000000000..ce7d672ab12c --- /dev/null +++ b/ports-mgmt/portupgrade/files/patch-lib-pkgmisc.rb @@ -0,0 +1,17 @@ +Index: lib/pkgmisc.rb +=================================================================== +RCS file: /cvsroot/portupgrade/pkgtools/lib/pkgmisc.rb,v +retrieving revision 1.2.2.2 +diff -u -r1.2.2.2 pkgmisc.rb +--- lib/pkgmisc.rb 24 Feb 2007 12:32:11 -0000 1.2.2.2 ++++ lib/pkgmisc.rb 2 Mar 2007 19:59:30 -0000 +@@ -93,7 +93,8 @@ + def shelljoin(*args) + args.collect { |arg| + if /[*?{}\[\]<>()~&|\\$;\'\`\"\s]/ =~ arg +- '"' + arg.gsub(/([$\\\"\`])/, "\\\\\\1") + '"' ++ a = '"' + arg.gsub(/([$\\\"\`])/, "\\\\\\1") + '"' ++ a.gsub(/\s/, '" "') + else + arg + end -- cgit v1.2.3