From owner-cvs-all Thu Apr 11 4:56:59 2002 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5E85D37B41A; Thu, 11 Apr 2002 04:56:56 -0700 (PDT) Received: (from roam@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3BBuuF07977; Thu, 11 Apr 2002 04:56:56 -0700 (PDT) (envelope-from roam) Message-Id: <200204111156.g3BBuuF07977@freefall.freebsd.org> From: Peter Pentchev Date: Thu, 11 Apr 2002 04:56:56 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: ports/x11/wrapper Makefile pkg-deinstall X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG roam 2002/04/11 04:56:56 PDT Modified files: x11/wrapper Makefile pkg-deinstall Log: Fix package deinstallation: only move X.bck over X if the former exists. Since pkg_deinstall(1) invokes the package deinstall script twice, at the second invocation X.bck is no longer there, and mv(1), even with the -f flag, returns a non-zero exit code. The shell executing the script propagates this exit code right back unto pkg_deinstall(1), which complains and aborts the package deinstallation. I wish I had not forgotten about this problem, so this could go in before DP1 was cut :( Approved by: no response from trevor@, the port maintainer Revision Changes Path 1.12 +1 -1 ports/x11/wrapper/Makefile 1.4 +3 -1 ports/x11/wrapper/pkg-deinstall To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message