summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2005-08-17 09:24:54 +0000
committerMarc Espie <espie@cvs.openbsd.org>2005-08-17 09:24:54 +0000
commitd7b420be3f06b98726a8480bc858f16ee6469d58 (patch)
treec078a4fb1e12f854af783053613be7fe91f2e36d /usr.sbin
parentba1b6bcbd4fc9bea2680c8744a7c46af18f77b5a (diff)
restore $main::not that is needed by OpenBSD::RequiredBy,
put an # XXX comment so I won't be tempted to clean it again.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg_add/pkg_add10
-rw-r--r--usr.sbin/pkg_add/pkg_delete3
2 files changed, 7 insertions, 6 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index 090f3600969..76b77547acb 100644
--- a/usr.sbin/pkg_add/pkg_add
+++ b/usr.sbin/pkg_add/pkg_add
@@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: pkg_add,v 1.187 2005/08/16 21:48:34 espie Exp $
+# $OpenBSD: pkg_add,v 1.188 2005/08/17 09:24:53 espie Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -35,12 +35,10 @@ use OpenBSD::Add;
use OpenBSD::SharedLibs;
use File::Path;
-our %forced = ();
-
-package main;
-
my $errors = 0;
+our %forced = ();
+our $not;
sub can_install($$$)
{
@@ -724,6 +722,8 @@ if (defined $state->{destdir}) {
$state->{not} = $opt_n || $opt_u;
+# XXX RequiredBy
+$not = $opt_n;
$state->{quick} = $opt_q;
$state->{extra} = $opt_c;
$state->{dont_run_scripts} = $opt_I;
diff --git a/usr.sbin/pkg_add/pkg_delete b/usr.sbin/pkg_add/pkg_delete
index 54cc17fcf42..ddf18230a25 100644
--- a/usr.sbin/pkg_add/pkg_delete
+++ b/usr.sbin/pkg_add/pkg_delete
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: pkg_delete,v 1.87 2005/01/22 13:00:35 espie Exp $
+# $OpenBSD: pkg_delete,v 1.88 2005/08/17 09:24:53 espie Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -78,6 +78,7 @@ my $removed;
try {
my $state = new OpenBSD::Error;
$state->{not} = $opt_n;
+# XXX RequiredBy
$not = $opt_n;
$state->{quick} = $opt_q;
$state->{verbose} = $opt_v >= 2;