diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2012-06-08 15:01:01 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2012-06-08 15:01:01 +0000 |
| commit | 65af66711b98a6a7233b4faad324cc3ed839a73f (patch) | |
| tree | b554d030dde3c7e46f6f7f5a8f2a310fb7e9d0aa /usr.sbin/pkg_add | |
| parent | 88871034cf1ba663180f5b399e0f5aa5866ca289 (diff) | |
silent rename of @comment subdir= to @comment pkgpath=
this makes more sense
Diffstat (limited to 'usr.sbin/pkg_add')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingElement.pm | 6 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingList.pm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm index 245a40c7abc..b807ea532f8 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.205 2012/05/15 08:14:29 espie Exp $ +# $OpenBSD: PackingElement.pm,v 1.206 2012/06/08 15:01:00 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -684,7 +684,7 @@ sub add if ($args =~ m/^\$OpenBSD.*\$\s*$/o) { return OpenBSD::PackingElement::CVSTag->add($plist, $args); - } elsif ($args =~ m/^subdir\=(.*?)\s+cdrom\=(.*?)\s+ftp\=(.*?)\s*$/o) { + } elsif ($args =~ m/^(?:subdir|pkgpath)\=(.*?)\s+cdrom\=(.*?)\s+ftp\=(.*?)\s*$/o) { return OpenBSD::PackingElement::ExtraInfo->add($plist, $1, $2, $3); } elsif ($args eq 'no checksum') { $plist->{state}->{nochecksum} = 1; @@ -940,7 +940,7 @@ sub stringize { my $self = shift; return join(' ', - "subdir=".$self->{subdir}, + "pkgpath=".$self->{subdir}, "cdrom=".may_quote($self->{cdrom}), "ftp=".may_quote($self->{ftp})); } diff --git a/usr.sbin/pkg_add/OpenBSD/PackingList.pm b/usr.sbin/pkg_add/OpenBSD/PackingList.pm index 8b5f37e52bd..44fc60510a4 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingList.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingList.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingList.pm,v 1.119 2012/05/15 08:14:29 espie Exp $ +# $OpenBSD: PackingList.pm,v 1.120 2012/06/08 15:01:00 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -237,7 +237,7 @@ sub ExtraInfoOnly my ($fh, $cont) = @_; my $_; while (<$fh>) { - if (m/^\@(?:name|pkgpath|comment\s+subdir\=)\b/o) { + if (m/^\@(?:name|pkgpath|comment\s+(?:subdir|pkgpath)\=)\b/o) { &$cont($_); # XXX optimization } elsif (m/^\@(?:depend|wantlib|newgroup|newuser|cwd)\b/o) { @@ -259,7 +259,7 @@ sub UpdateInfoOnly } return; } - if (m/^\@(?:name|depend|wantlib|conflict|option|pkgpath|url|arch|comment\s+subdir\=)\b/o) { + if (m/^\@(?:name|depend|wantlib|conflict|option|pkgpath|url|arch|comment\s+(?:subdir|pkgpath)\=)\b/o) { &$cont($_); # XXX optimization } elsif (m/^\@(?:newgroup|newuser|cwd)\b/o) { |