Update to portupgrade 1.27.

Everything should now be fine while bug reports and thoughtful
suggestions are always welcome.
This commit is contained in:
Akinori MUSHA 2001-05-29 22:21:34 +00:00
parent cbe50db5a9
commit a3b1fbaca7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=43292
12 changed files with 12 additions and 196 deletions

View file

@ -6,13 +6,12 @@
#
PORTNAME= portupgrade
PORTVERSION= 1.26
PORTREVISION= 1
PORTVERSION= 1.27
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://www.iDaemons.org/distfiles/
MASTER_SITE_SUBDIR= knu
DISTNAME= pkgtools-20010530
DISTNAME= pkgtools-20010530b
MAINTAINER= knu@FreeBSD.org

View file

@ -1 +1 @@
MD5 (pkgtools-20010530.tar.gz) = 04d3a9635511b9b226050ffa889ceb89
MD5 (pkgtools-20010530b.tar.gz) = dacc64af0074fa2f94f8d9723c3d7a68

View file

@ -1,45 +0,0 @@
Index: pkgdb.rb
===================================================================
RCS file: /home/cvs/pkgtools/pkgdb.rb,v
retrieving revision 1.13
diff -u -r1.13 pkgdb.rb
--- pkgdb.rb 2001/05/29 19:12:44 1.13
+++ pkgdb.rb 2001/05/29 21:28:33
@@ -113,9 +113,20 @@
def glob(pattern = '*')
list = []
+ complete = false
- Dir.glob(File.join(@db_dir, pattern)).sort.each do |pkgname|
+ g = Dir.glob(File.join(@db_dir, pattern))
+ if g.empty?
+ complete = true
+ g = Dir.glob(File.join(@db_dir, pattern + '-*'))
+ end
+
+ g.sort.each do |pkgname|
pkgname.slice!(0, @db_dir.size + 1)
+
+ if complete
+ /^#{Regexp.quote(pattern)}-[^\-]+$/ =~ pkgname or next
+ end
next unless installed?(pkgname)
Index: portversion
===================================================================
RCS file: /home/cvs/pkgtools/portversion,v
retrieving revision 1.4
diff -u -r1.4 portversion
--- portversion 2001/05/29 20:38:32 1.4
+++ portversion 2001/05/29 21:32:00
@@ -208,7 +208,7 @@
newpkg = nil
if $?
- return [5, nil]
+# return [5, nil]
end
begin

View file

@ -6,13 +6,12 @@
#
PORTNAME= portupgrade
PORTVERSION= 1.26
PORTREVISION= 1
PORTVERSION= 1.27
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://www.iDaemons.org/distfiles/
MASTER_SITE_SUBDIR= knu
DISTNAME= pkgtools-20010530
DISTNAME= pkgtools-20010530b
MAINTAINER= knu@FreeBSD.org

View file

@ -1 +1 @@
MD5 (pkgtools-20010530.tar.gz) = 04d3a9635511b9b226050ffa889ceb89
MD5 (pkgtools-20010530b.tar.gz) = dacc64af0074fa2f94f8d9723c3d7a68

View file

@ -1,45 +0,0 @@
Index: pkgdb.rb
===================================================================
RCS file: /home/cvs/pkgtools/pkgdb.rb,v
retrieving revision 1.13
diff -u -r1.13 pkgdb.rb
--- pkgdb.rb 2001/05/29 19:12:44 1.13
+++ pkgdb.rb 2001/05/29 21:28:33
@@ -113,9 +113,20 @@
def glob(pattern = '*')
list = []
+ complete = false
- Dir.glob(File.join(@db_dir, pattern)).sort.each do |pkgname|
+ g = Dir.glob(File.join(@db_dir, pattern))
+ if g.empty?
+ complete = true
+ g = Dir.glob(File.join(@db_dir, pattern + '-*'))
+ end
+
+ g.sort.each do |pkgname|
pkgname.slice!(0, @db_dir.size + 1)
+
+ if complete
+ /^#{Regexp.quote(pattern)}-[^\-]+$/ =~ pkgname or next
+ end
next unless installed?(pkgname)
Index: portversion
===================================================================
RCS file: /home/cvs/pkgtools/portversion,v
retrieving revision 1.4
diff -u -r1.4 portversion
--- portversion 2001/05/29 20:38:32 1.4
+++ portversion 2001/05/29 21:32:00
@@ -208,7 +208,7 @@
newpkg = nil
if $?
- return [5, nil]
+# return [5, nil]
end
begin

View file

@ -6,13 +6,12 @@
#
PORTNAME= portupgrade
PORTVERSION= 1.26
PORTREVISION= 1
PORTVERSION= 1.27
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://www.iDaemons.org/distfiles/
MASTER_SITE_SUBDIR= knu
DISTNAME= pkgtools-20010530
DISTNAME= pkgtools-20010530b
MAINTAINER= knu@FreeBSD.org

View file

@ -1 +1 @@
MD5 (pkgtools-20010530.tar.gz) = 04d3a9635511b9b226050ffa889ceb89
MD5 (pkgtools-20010530b.tar.gz) = dacc64af0074fa2f94f8d9723c3d7a68

View file

@ -1,45 +0,0 @@
Index: pkgdb.rb
===================================================================
RCS file: /home/cvs/pkgtools/pkgdb.rb,v
retrieving revision 1.13
diff -u -r1.13 pkgdb.rb
--- pkgdb.rb 2001/05/29 19:12:44 1.13
+++ pkgdb.rb 2001/05/29 21:28:33
@@ -113,9 +113,20 @@
def glob(pattern = '*')
list = []
+ complete = false
- Dir.glob(File.join(@db_dir, pattern)).sort.each do |pkgname|
+ g = Dir.glob(File.join(@db_dir, pattern))
+ if g.empty?
+ complete = true
+ g = Dir.glob(File.join(@db_dir, pattern + '-*'))
+ end
+
+ g.sort.each do |pkgname|
pkgname.slice!(0, @db_dir.size + 1)
+
+ if complete
+ /^#{Regexp.quote(pattern)}-[^\-]+$/ =~ pkgname or next
+ end
next unless installed?(pkgname)
Index: portversion
===================================================================
RCS file: /home/cvs/pkgtools/portversion,v
retrieving revision 1.4
diff -u -r1.4 portversion
--- portversion 2001/05/29 20:38:32 1.4
+++ portversion 2001/05/29 21:32:00
@@ -208,7 +208,7 @@
newpkg = nil
if $?
- return [5, nil]
+# return [5, nil]
end
begin

View file

@ -6,13 +6,12 @@
#
PORTNAME= portupgrade
PORTVERSION= 1.26
PORTREVISION= 1
PORTVERSION= 1.27
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://www.iDaemons.org/distfiles/
MASTER_SITE_SUBDIR= knu
DISTNAME= pkgtools-20010530
DISTNAME= pkgtools-20010530b
MAINTAINER= knu@FreeBSD.org

View file

@ -1 +1 @@
MD5 (pkgtools-20010530.tar.gz) = 04d3a9635511b9b226050ffa889ceb89
MD5 (pkgtools-20010530b.tar.gz) = dacc64af0074fa2f94f8d9723c3d7a68

View file

@ -1,45 +0,0 @@
Index: pkgdb.rb
===================================================================
RCS file: /home/cvs/pkgtools/pkgdb.rb,v
retrieving revision 1.13
diff -u -r1.13 pkgdb.rb
--- pkgdb.rb 2001/05/29 19:12:44 1.13
+++ pkgdb.rb 2001/05/29 21:28:33
@@ -113,9 +113,20 @@
def glob(pattern = '*')
list = []
+ complete = false
- Dir.glob(File.join(@db_dir, pattern)).sort.each do |pkgname|
+ g = Dir.glob(File.join(@db_dir, pattern))
+ if g.empty?
+ complete = true
+ g = Dir.glob(File.join(@db_dir, pattern + '-*'))
+ end
+
+ g.sort.each do |pkgname|
pkgname.slice!(0, @db_dir.size + 1)
+
+ if complete
+ /^#{Regexp.quote(pattern)}-[^\-]+$/ =~ pkgname or next
+ end
next unless installed?(pkgname)
Index: portversion
===================================================================
RCS file: /home/cvs/pkgtools/portversion,v
retrieving revision 1.4
diff -u -r1.4 portversion
--- portversion 2001/05/29 20:38:32 1.4
+++ portversion 2001/05/29 21:32:00
@@ -208,7 +208,7 @@
newpkg = nil
if $?
- return [5, nil]
+# return [5, nil]
end
begin