diff options
| author | Sergey Matveychuk <sem@FreeBSD.org> | 2007-03-02 20:10:08 +0000 |
|---|---|---|
| committer | Sergey Matveychuk <sem@FreeBSD.org> | 2007-03-02 20:10:08 +0000 |
| commit | e5266e2a29c56773991388ab58acf375a64de7d0 (patch) | |
| tree | d21d0b4e897d35e621eb72cee631225d1d3815f1 /ports-mgmt | |
| parent | c579ee870f04173125722f8a36937b1cd6aef648 (diff) | |
| download | ports-e5266e2a29c56773991388ab58acf375a64de7d0.tar.gz ports-e5266e2a29c56773991388ab58acf375a64de7d0.zip | |
- Fix a long standing bug when shelljoin() function wrong placed ""
when more than one variables (WITH_*, WITHOUT_*) passed.
Notes
Notes:
svn path=/head/; revision=186369
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-lib-pkgmisc.rb | 17 |
2 files changed, 18 insertions, 1 deletions
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 |