diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-07-29 23:41:19 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-07-29 23:41:19 +0000 |
| commit | 06d9bebb7771e84a0350fc79811edd84e0f028c5 (patch) | |
| tree | 1854e058ddd09f62f056bebfd7021c79589dfa1b /ports-mgmt | |
| parent | f0a1c5bc72a19366e4ee77eb8ec344083d02a721 (diff) | |
| download | ports-06d9bebb7771e84a0350fc79811edd84e0f028c5.tar.gz ports-06d9bebb7771e84a0350fc79811edd84e0f028c5.zip | |
Quick fix for pkg-1.3 delete handling. It now requires -f to not automatically
recurse.
Notes
Notes:
svn path=/head/; revision=363413
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-bin__pkg_glob | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index 2869fb3bfe0e..3ce03fca5bc9 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -3,7 +3,7 @@ PORTNAME= portupgrade PORTVERSION= 2.4.12 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= SF/portupgrade/pkgtools/dist/ \ diff --git a/ports-mgmt/portupgrade/files/patch-bin__pkg_glob b/ports-mgmt/portupgrade/files/patch-bin__pkg_glob new file mode 100644 index 000000000000..2dbce9aca7f8 --- /dev/null +++ b/ports-mgmt/portupgrade/files/patch-bin__pkg_glob @@ -0,0 +1,10 @@ +--- ./bin/pkg_glob.orig 2014-07-29 18:39:52.706051787 -0500 ++++ ./bin/pkg_glob 2014-07-29 18:40:31.759049595 -0500 +@@ -415,6 +415,7 @@ + return true if $noexecute + + if $pkgdb.with_pkgng? ++ $pkg_delete_args.push '-f' + cmdargs = [PkgDB::command(:pkg), 'delete', *$pkg_delete_args] << pkgname + else + cmdargs = [PkgDB::command(:pkg_delete), *$pkg_delete_args] << pkgname |