diff options
| author | Sergey Matveychuk <sem@FreeBSD.org> | 2008-01-27 22:45:27 +0000 |
|---|---|---|
| committer | Sergey Matveychuk <sem@FreeBSD.org> | 2008-01-27 22:45:27 +0000 |
| commit | 04e277677034708257f0c9462528e9d2f74a1fe7 (patch) | |
| tree | 3ac5d868e764682b889423f07242c8d266e3def8 /ports-mgmt/portupgrade-devel | |
| parent | 85e645b592d01941a788c77507f2bcca8c7f75dd (diff) | |
| download | ports-04e277677034708257f0c9462528e9d2f74a1fe7.tar.gz ports-04e277677034708257f0c9462528e9d2f74a1fe7.zip | |
- Fix a function name
- When in task list is a port with IGNORE, portupgrade fails. Just ignore it now.
Reported by: Gerard <gerard@seibercom.net>,
Matthew Seaman <m.seaman@infracaninophile.co.uk>
Notes
Notes:
svn path=/head/; revision=206296
Diffstat (limited to 'ports-mgmt/portupgrade-devel')
| -rw-r--r-- | ports-mgmt/portupgrade-devel/Makefile | 1 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index a7c0e881f050..f89d563067c5 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= portupgrade-devel PORTVERSION= 2.4.0 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= portupgrade diff --git a/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade b/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade new file mode 100644 index 000000000000..e9672aec4215 --- /dev/null +++ b/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade @@ -0,0 +1,32 @@ +Index: bin/portupgrade +=================================================================== +RCS file: /cvsroot/portupgrade/pkgtools/bin/portupgrade,v +retrieving revision 1.42 +retrieving revision 1.45 +diff -u -r1.42 -r1.45 +--- bin/portupgrade 26 Jan 2008 16:01:16 -0000 1.42 ++++ bin/portupgrade 27 Jan 2008 22:33:51 -0000 1.45 +@@ -614,7 +614,13 @@ + pkg = PkgInfo.new(task) + origin = $pkgdb.origin(task) + if !origin.nil? +- name = get_pkgname(origin) ++ begin ++ name = get_pkgname(origin) ++ rescue IgnoreMarkError => e ++ $results << PkgResult.new(origin, :ignored, e.message) ++ not_need_upgrade << task ++ next ++ end + name =~ /^(.+)-([^-]+)$/ + newversion = PkgVersion.new($2) + if newversion <= pkg.version && !$force +@@ -694,7 +700,7 @@ + + install_tasks << origin + # Track all uninstalled +- get_uninstalled_depends(origin).each do |dep| ++ get_notinstalled_depends(origin).each do |dep| + install_tasks << dep + end + end |