mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-10 07:04:03 +00:00
- Update to 2.4.2
Minor bugs was fixed. Thanks to all reporters!
This commit is contained in:
parent
3a6d4150c4
commit
7df6b2f6d9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=206709
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= portupgrade-devel
|
||||
PORTVERSION= 2.4.1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 2.4.2
|
||||
CATEGORIES= ports-mgmt
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= portupgrade
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (pkgtools-2.4.1.tar.bz2) = 948eef56de74207e14be0f4bb9ae1195
|
||||
SHA256 (pkgtools-2.4.1.tar.bz2) = f41a63448f2d59c538e9f721bae74d5d652361f474cc7f99763988c52722137c
|
||||
SIZE (pkgtools-2.4.1.tar.bz2) = 112846
|
||||
MD5 (pkgtools-2.4.2.tar.bz2) = b812cc55ed3adb681ef93ff5d4674fbd
|
||||
SHA256 (pkgtools-2.4.2.tar.bz2) = c04943949eee29d1ae3a180bd9925889974d1fb4c908545f009065770abd2d34
|
||||
SIZE (pkgtools-2.4.2.tar.bz2) = 112921
|
||||
|
@ -1,33 +0,0 @@
|
||||
--- bin/portupgrade.orig 2008-01-31 19:14:25.000000000 +0300
|
||||
+++ bin/portupgrade 2008-01-31 19:14:32.000000000 +0300
|
||||
@@ -620,11 +620,20 @@
|
||||
origin = $pkgdb.origin(task)
|
||||
if !origin.nil?
|
||||
begin
|
||||
+ if config_held?(task)
|
||||
+ STDERR.puts "#{task} is in HOLD_PKG. Ignored."
|
||||
+ $results << PkgResult.new(origin, :ignored, "is in HOLD_PKG")
|
||||
+ not_need_upgrade << task
|
||||
+ next
|
||||
+ end
|
||||
+
|
||||
name = get_pkgname(origin)
|
||||
rescue IgnoreMarkError => e
|
||||
$results << PkgResult.new(origin, :ignored, e.message)
|
||||
not_need_upgrade << task
|
||||
next
|
||||
+ rescue PortDirError => e
|
||||
+ #STDERR.puts "No port dir for #{task}"
|
||||
end
|
||||
name =~ /^(.+)-([^-]+)$/
|
||||
newversion = PkgVersion.new($2)
|
||||
@@ -640,6 +649,9 @@
|
||||
upgrade_tasks |= depends
|
||||
end
|
||||
install_tasks |= get_notinstalled_depends(origin)
|
||||
+ else
|
||||
+ # There is no origin for some reason
|
||||
+ not_need_upgrade << task
|
||||
end
|
||||
end
|
||||
upgrade_tasks -= not_need_upgrade
|
Loading…
Reference in New Issue
Block a user