make it possible to run without locking the database. To be used by

SRC: url, which require it.

3 files changed, 15 insertions, 9 deletions

diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index be6e75d2c11..b6750d97330 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.328 2007/06/30 11:38:38 espie Exp $
+# $OpenBSD: pkg_add,v 1.329 2007/12/18 10:58:46 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -609,7 +609,7 @@ if (@ARGV == 0 && !$opt_u) {
 	Usage "Missing pkgname";
 }
 
-lock_db($state->{not});
+lock_db($state->{not}) unless $state->{forced}->{nolock};
 $state->setup_progressmeter($opt_x);
 $state->check_root;
 
diff --git a/usr.sbin/pkg_add/pkg_delete b/usr.sbin/pkg_add/pkg_delete
index 232662d0e19..4af789e2130 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.110 2007/06/30 11:38:38 espie Exp $
+# $OpenBSD: pkg_delete,v 1.111 2007/12/18 10:58:46 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -105,7 +105,7 @@ if ($opt_B eq '') {
 
 $ENV{'PKG_DELETE_EXTRA'} = $state->{extra} ? "Yes" : "No";
 
-lock_db($opt_n);
+lock_db($opt_n) unless $state->{forced}->{nolock};
 $state->setup_progressmeter($opt_x);
 $state->check_root;
 
diff --git a/usr.sbin/pkg_add/pkg_info b/usr.sbin/pkg_add/pkg_info
index 564274c163f..4849ac2e084 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.64 2007/12/08 15:54:45 espie Exp $
+# $OpenBSD: pkg_info,v 1.65 2007/12/18 10:58:46 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -340,16 +340,17 @@ sub print_info
 	}
 }
 
-set_usage('pkg_info [-AacDdfIiKkLMPpqRrSstUv] [-E filename] [-e pkg-name] [-l str] [-Q query] [pkg-name] [...]');
+set_usage('pkg_info [-AacDdfIiKkLMPpqRrSstUv] [-F opt] [-E filename] [-e pkg-name] [-l str] [-Q query] [pkg-name] [...]');
 
+my %forced;
 my $locked;
 try { 
-	getopts('cDdfhIikKLmpPQ:qRrsSUve:E:Ml:aAt',
+	getopts('cDdfF:hIikKLmpPQ:qRrsSUve:E:Ml:aAt',
 	    {'e' =>
 		    sub {
 			    my $pat = shift;
 			    my @list;
-			    lock_db(1, $opt_q);
+			    lock_db(1, $opt_q) unless $forced{nolock};
 			    $locked = 1;
 			    if ($pat =~ m/\//o) {
 				    @list = find_by_path($pat);
@@ -363,6 +364,11 @@ try {
 			    push(@ARGV, @list);
 			    $terse = 1;
 		    },
+	     'F' => sub { 
+			    for my $o (split /\,/o, shift) { 
+				    $forced{$o} = 1;
+			    }
+		    },
 	     'h' => sub {	Usage(); },
 	     'E' =>
 		    sub {
@@ -376,7 +382,7 @@ try {
 	Usage($_);
 };
 
-lock_db(1, $opt_q) unless $locked;
+lock_db(1, $opt_q) unless $locked or $forced{nolock};
 
 if ($opt_D) {
 	$opt_M = 1;