mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

- Fix a function name

Browse Source 
- 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>
This commit is contained in:
Sergey Matveychuk 2008-01-27 22:45:27 +00:00
parent 85e645b592
commit 04e2776770
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=206296
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports-mgmt/portupgrade-devel/Makefile
View File

@ -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

32
ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade Normal file
View File

@ -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