From 86ea81e339aeb4d313b38518a231be63f4ca9d87 Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Thu, 16 Dec 2004 11:07:34 +0000 Subject: renamed borked_installation from borked.n to partial- ... partial-.n if needed. Make borked_installation take a message, to show installation/deinstallation issues correctly. Fix handling of ^C: this may lead some system calls to return early, thus registering as errors: so always mark the last file as done, so that borked installation will register it correctly. Kill packing-list cache for anything but depends: we've got a global cache of libraries now (use it in pkg_add). Make almost everyone look at $main::not, so that we can call register_installation to_installation RequirementList->add/delete safely. Simplify $not logic accordingly, do thing much more closely to what would happen without -n. This should allow pkg_add/pkg_delete -n to handle most nasty cases correctly now, since all the relevant information is kept internally in a compact format: - register of shared libraries - global register of conflicts - cache of depends. --- usr.sbin/pkg_add/pkg_info | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'usr.sbin/pkg_add/pkg_info') diff --git a/usr.sbin/pkg_add/pkg_info b/usr.sbin/pkg_add/pkg_info index 6eeb6e83215..9dc6c51502a 100644 --- a/usr.sbin/pkg_add/pkg_info +++ b/usr.sbin/pkg_add/pkg_info @@ -1,6 +1,6 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_info,v 1.24 2004/12/12 11:26:16 espie Exp $ +# $OpenBSD: pkg_info,v 1.25 2004/12/16 11:07:33 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie # @@ -104,7 +104,6 @@ sub filter_files push(@result, $pkg); } } - $plist->forget(); }); } return @result; -- cgit v1.2.3