summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add/pkg_info
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2004-12-16 11:07:34 +0000
committerMarc Espie <espie@cvs.openbsd.org>2004-12-16 11:07:34 +0000
commit86ea81e339aeb4d313b38518a231be63f4ca9d87 (patch)
tree40c99208f6508f056284c00812b1b3631088700d /usr.sbin/pkg_add/pkg_info
parentd2d50b3b133e21371ff746b5b05a9ea319f07878 (diff)
renamed borked_installation from borked.n to partial-<pkgname> ...
partial-<pkgname>.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.
Diffstat (limited to 'usr.sbin/pkg_add/pkg_info')
-rw-r--r--usr.sbin/pkg_add/pkg_info3
1 files changed, 1 insertions, 2 deletions
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 <espie@openbsd.org>
#
@@ -104,7 +104,6 @@ sub filter_files
push(@result, $pkg);
}
}
- $plist->forget();
});
}
return @result;