summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2008-10-26 16:16:38 +0000
committerMarc Espie <espie@cvs.openbsd.org>2008-10-26 16:16:38 +0000
commitea6fea0831fb49ea9bdd582d06eb5975d11966ed (patch)
tree6a5fae10329e5b6b39bde398f939a4f3066706bb
parent9442cd1890c076c6fcb95735caac32cc5e87128f (diff)
zap old code that was a confusion with -l, and didn't ever do anything
in the new pkg_info problem noticed by landry@
-rw-r--r--usr.sbin/pkg_add/pkg_info10
-rw-r--r--usr.sbin/pkg_add/pkg_info.18
2 files changed, 8 insertions, 10 deletions
diff --git a/usr.sbin/pkg_add/pkg_info b/usr.sbin/pkg_add/pkg_info
index 684a3dac127..650688b1d42 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.69 2008/10/20 10:25:16 espie Exp $
+# $OpenBSD: pkg_info,v 1.70 2008/10/26 16:16:37 espie Exp $
#
# Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
#
@@ -227,7 +227,7 @@ sub find_by_path
}
our ($opt_c, $opt_D, $opt_d, $opt_f, $opt_I, $opt_i, $opt_k, $opt_K, $opt_L,
- $opt_m, $opt_p, $opt_Q, $opt_q, $opt_R, $opt_r, $opt_s, $opt_v, $opt_h,
+ $opt_m, $opt_Q, $opt_q, $opt_R, $opt_r, $opt_s, $opt_v, $opt_h,
$opt_l, $opt_a, $opt_M, $opt_U, $opt_A, $opt_S, $opt_P, $opt_t);
my $terse = 0;
my $exit_code = 0;
@@ -357,12 +357,12 @@ sub print_info
}
}
-set_usage('pkg_info [-AacDdfIiKkLMPpqRrSstUv] [-F opt] [-E filename] [-e pkg-name] [-l str] [-Q query] [pkg-name] [...]');
+set_usage('pkg_info [-AacDdfIiKkLMPqRrSstUv] [-F opt] [-E filename] [-e pkg-name] [-l str] [-Q query] [pkg-name] [...]');
my %defines;
my $locked;
try {
- getopts('cDdfF:hIikKLmpPQ:qRrsSUve:E:Ml:aAt',
+ getopts('cDdfF:hIikKLmPQ:qRrsSUve:E:Ml:aAt',
{'e' =>
sub {
my $pat = shift;
@@ -406,7 +406,7 @@ if ($opt_D) {
}
unless ($opt_c || $opt_M || $opt_U || $opt_d || $opt_f || $opt_I || $opt_i ||
- $opt_k || $opt_L || $opt_m || $opt_p || $opt_R || $opt_r || $opt_s ||
+ $opt_k || $opt_L || $opt_m || $opt_R || $opt_r || $opt_s ||
$opt_S || $opt_P || $terse) {
if (@ARGV == 0) {
$opt_I = $opt_a = 1;
diff --git a/usr.sbin/pkg_add/pkg_info.1 b/usr.sbin/pkg_add/pkg_info.1
index d39eb952ff2..39ba3b29b0c 100644
--- a/usr.sbin/pkg_add/pkg_info.1
+++ b/usr.sbin/pkg_add/pkg_info.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pkg_info.1,v 1.29 2007/10/31 14:45:06 jmc Exp $
+.\" $OpenBSD: pkg_info.1,v 1.30 2008/10/26 16:16:37 espie Exp $
.\"
.\" Documentation and design originally from FreeBSD. All the code has
.\" been rewritten since. We keep the documentation's notice:
@@ -15,7 +15,7 @@
.\" Jordan K. Hubbard
.\"
.\"
-.Dd $Mdocdate: October 31 2007 $
+.Dd $Mdocdate: October 26 2008 $
.Dt PKG_INFO 1
.Os
.Sh NAME
@@ -24,7 +24,7 @@
.Sh SYNOPSIS
.Nm pkg_info
.Bk -words
-.Op Fl AacDdfIiKkLMPpqRrSstUv
+.Op Fl AacDdfIiKkLMPqRrSstUv
.Op Fl E Ar filename
.Op Fl e Ar pkg-name
.Op Fl l Ar str
@@ -141,8 +141,6 @@ Show the install-message file (if any) for each package.
.It Fl P
Show the pkgpath for each package.
You can easily build a subdirlist with this.
-.It Fl p
-Show the installation prefix for each package.
.It Fl Q Ar query
Show all packages in $PKG_PATH which match the given
.Ar query .