Date: Fri, 29 Jul 2005 16:23:56 +0900 (JST)
From: KOMATSU Shinichiro <koma2@lovepeers.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: daichi@FreeBSD.org
Subject: ports/84278: sysutils/portupgrade: Pass full path to pkg_{add, info} invoked from portupgrade.
Message-ID: <20050729072356.D99C056508@ksta.ms.u-tokyo.ac.jp>
Resent-Message-ID: <200507290730.j6T7UOXU050020@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84278
>Category: ports
>Synopsis: sysutils/portupgrade: Pass full path to pkg_{add,info} invoked from portupgrade.
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 29 07:30:24 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: KOMATSU Shinichiro
>Release: FreeBSD 5.4-RELEASE-p5 i386
>Organization:
>Environment:
FreeBSD 5.4-RELEASE-p5 i386
>Description:
Pass full path instead of just filename to pkg_{add,info} invoked from portupgrade.
This should fix the following PRs:
ports/70802 : portupgrade cannot find downloaded package
ports/72373 : portupgrade/pkg_info falsely complains it can't find
ports/75188 : sysutils/portupgrade fails to install dependent packages
>How-To-Repeat:
>Fix:
diff --exclude=CVS --exclude=*.log* -urN portupgrade.old/Makefile portupgrade/Makefile
--- portupgrade.old/Makefile Sat Jul 9 15:10:20 2005
+++ portupgrade/Makefile Fri Jul 29 15:59:25 2005
@@ -7,7 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 20041226
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}
diff --exclude=CVS --exclude=*.log* -urN portupgrade.old/files/patch-bin-portupgrade portupgrade/files/patch-bin-portupgrade
--- portupgrade.old/files/patch-bin-portupgrade Thu Jan 1 09:00:00 1970
+++ portupgrade/files/patch-bin-portupgrade Fri Jul 29 15:49:39 2005
@@ -0,0 +1,22 @@
+Index: bin/portupgrade
+===================================================================
+--- bin/portupgrade (revision 34)
++++ bin/portupgrade (revision 36)
+@@ -1560,7 +1560,7 @@
+
+ timer_start(time_key = "Installation of #{pkgname}")
+
+- cmdargs = [PkgDB::command(:pkg_add), '-f', pkgname]
++ cmdargs = [PkgDB::command(:pkg_add), '-f', pkgfile]
+
+ progress_message "Installing the new version via the package"
+
+@@ -1705,7 +1705,7 @@
+ id_pkgname, id_origin, pkgdep = identify_pkg(file)
+
+ if id_origin == origin
+- pkglist << [PkgInfo.new(id_pkgname), file]
++ pkglist << [PkgInfo.new(id_pkgname), File.join(dir, file)]
+ end
+ }
+ }
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050729072356.D99C056508>