From owner-cvs-ports@FreeBSD.ORG Sun Dec 4 06:39:12 2005 Return-Path: X-Original-To: cvs-ports@FreeBSD.org Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E43F816A41F; Sun, 4 Dec 2005 06:39:12 +0000 (GMT) (envelope-from edwin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5972543D66; Sun, 4 Dec 2005 06:39:12 +0000 (GMT) (envelope-from edwin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB46dC2V004013; Sun, 4 Dec 2005 06:39:12 GMT (envelope-from edwin@repoman.freebsd.org) Received: (from edwin@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB46dCr1004012; Sun, 4 Dec 2005 06:39:12 GMT (envelope-from edwin) Message-Id: <200512040639.jB46dCr1004012@repoman.freebsd.org> From: Edwin Groothuis Date: Sun, 4 Dec 2005 06:39:12 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: ports/sysutils/portupgrade Makefile distinfo ports/sysutils/portupgrade/files patch-CAN-2005-0610 patch-Makefile.compat patch-bin-pkgdb patch-bin-portsclean.1 patch-bin-portupgrade patch-etc-Makefile patch-etc-pkgtools.conf patch-lib_portsdb.rb X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Dec 2005 06:39:13 -0000 edwin 2005-12-04 06:39:12 UTC FreeBSD ports repository Modified files: sysutils/portupgrade Makefile distinfo Removed files: sysutils/portupgrade/files patch-CAN-2005-0610 patch-Makefile.compat patch-bin-pkgdb patch-bin-portsclean.1 patch-bin-portupgrade patch-etc-Makefile patch-etc-pkgtools.conf patch-lib_portsdb.rb Log: sysutils/portupgrade: fix the problem that portupgrade sometimes runs slow, and bump PORTVERSION to 20051204. (1) For years, I have experienced that portupgrade sometimes runs very slow. After some investigation, I found that "pkgdb -aF" is invoked from portupgrade or other programs (such as portversion) without having sufficient privilege to modify /var/db/pkg/, and that error is not caught by the caller program, and "pkgdb -aF" is invoked repeatedlly. So, I fixed the following things: - When pkgdb internally invoked from other program exits with error, make the caller program also exit with error. - Display the error messages of pkgdb that run internally from other program. When portupgrade or other programs die with the following error, ** You do not own /var/db/pkg. (use -f to force or run as root) Command failed [exit code 1]: /usr/local/sbin/pkgdb -aFQ please run "pkgdb -aF" as the user that owns /var/db/pkg (usually root). (2) Make new tarball that contains the above fix and all patches in files/. Bump PORTVERSION to 20051204 and change MASTER_SITES. PR: ports/89917 Submitted by: KOMATSU Shinichiro Revision Changes Path 1.206 +4 -6 ports/sysutils/portupgrade/Makefile 1.156 +3 -6 ports/sysutils/portupgrade/distinfo 1.3 +0 -75 ports/sysutils/portupgrade/files/patch-CAN-2005-0610 (dead) 1.2 +0 -11 ports/sysutils/portupgrade/files/patch-Makefile.compat (dead) 1.2 +0 -13 ports/sysutils/portupgrade/files/patch-bin-pkgdb (dead) 1.2 +0 -24 ports/sysutils/portupgrade/files/patch-bin-portsclean.1 (dead) 1.2 +0 -22 ports/sysutils/portupgrade/files/patch-bin-portupgrade (dead) 1.2 +0 -14 ports/sysutils/portupgrade/files/patch-etc-Makefile (dead) 1.2 +0 -16 ports/sysutils/portupgrade/files/patch-etc-pkgtools.conf (dead) 1.3 +0 -24 ports/sysutils/portupgrade/files/patch-lib_portsdb.rb (dead)