Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11]) by narn.NetBSD.org (Postfix) with ESMTP id DBC5763B877 for ; Wed, 17 Sep 2008 15:21:31 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 0) id 745EE63B222; Wed, 17 Sep 2008 15:21:31 +0000 (UTC) Received: from cvs.netbsd.org (unknown [IPv6:2001:4f8:4:7:2e0:81ff:fe25:eab4]) by mail.netbsd.org (Postfix) with ESMTP id 9B01563B21D for ; Wed, 17 Sep 2008 15:21:30 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 78CB5175D0; Wed, 17 Sep 2008 15:21:30 +0000 (UTC) From: Joerg Sonnenberger Subject: CVS commit: pkgsrc/pkgtools/pkg_install/files To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org Message-Id: <20080917152130.78CB5175D0@cvs.netbsd.org> Date: Wed, 17 Sep 2008 15:21:30 +0000 (UTC) Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes Precedence: list Module Name: pkgsrc Committed By: joerg Date: Wed Sep 17 15:21:30 UTC 2008 Modified Files: pkgsrc/pkgtools/pkg_install/files/add: perform.c pkgsrc/pkgtools/pkg_install/files/admin: check.c main.c pkgsrc/pkgtools/pkg_install/files/create: perform.c pkgsrc/pkgtools/pkg_install/files/delete: perform.c pkgsrc/pkgtools/pkg_install/files/lib: conflicts.c lib.h plist.c version.h Log Message: pkg_install-20080916: Merge from changes for read_plist from pkg_install-renovation to always initialize the plist and add append_plist for the one case where this is not desired. Fixes PR 39276. To generate a diff of this commit: cvs rdiff -r1.72 -r1.73 pkgsrc/pkgtools/pkg_install/files/add/perform.c cvs rdiff -r1.4 -r1.5 pkgsrc/pkgtools/pkg_install/files/admin/check.c cvs rdiff -r1.44 -r1.45 pkgsrc/pkgtools/pkg_install/files/admin/main.c cvs rdiff -r1.21 -r1.22 pkgsrc/pkgtools/pkg_install/files/create/perform.c cvs rdiff -r1.23 -r1.24 pkgsrc/pkgtools/pkg_install/files/delete/perform.c cvs rdiff -r1.6 -r1.7 pkgsrc/pkgtools/pkg_install/files/lib/conflicts.c cvs rdiff -r1.44 -r1.45 pkgsrc/pkgtools/pkg_install/files/lib/lib.h cvs rdiff -r1.20 -r1.21 pkgsrc/pkgtools/pkg_install/files/lib/plist.c cvs rdiff -r1.104 -r1.105 pkgsrc/pkgtools/pkg_install/files/lib/version.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.