summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
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/OpenBSD/PackingElement.pm
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/OpenBSD/PackingElement.pm')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PackingElement.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
index d2552514585..13178f54d06 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: PackingElement.pm,v 1.74 2004/12/09 18:58:25 espie Exp $
+# $OpenBSD: PackingElement.pm,v 1.75 2004/12/16 11:07:33 espie Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -434,7 +434,7 @@ sub ensure_ldconfig
if ($todo) {
require OpenBSD::SharedLibs;
- &OpenBSD::SharedLibs::ensure_ldconfig();
+ &OpenBSD::SharedLibs::ensure_ldconfig;
}
}