diff options
| author | bmah <bmah@FreeBSD.org> | 2000-10-26 21:50:41 +0000 |
|---|---|---|
| committer | bmah <bmah@FreeBSD.org> | 2000-10-26 21:50:41 +0000 |
| commit | 5f7239d1a1d00aca963a4130a4ea09d298211ec8 (patch) | |
| tree | 8430301088b3763b88ca8cddc2490d9d0957167f /usr.sbin/pkg_install | |
| parent | f428d434920986578563e6acf82617dde3ca4bd3 (diff) | |
| download | FreeBSD-src-5f7239d1a1d00aca963a4130a4ea09d298211ec8.zip FreeBSD-src-5f7239d1a1d00aca963a4130a4ea09d298211ec8.tar.gz | |
Sigh. It'd be nice to completely commit a bugfix. Once again:
Fix a bug in which pkg_version(1) was ignoring $PORTREVISION
or $PORTEPOCH from ports' Makefile definitions.
Diffstat (limited to 'usr.sbin/pkg_install')
| -rwxr-xr-x | usr.sbin/pkg_install/version/pkg_version.pl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/pkg_install/version/pkg_version.pl b/usr.sbin/pkg_install/version/pkg_version.pl index 2a78898..633e107 100755 --- a/usr.sbin/pkg_install/version/pkg_version.pl +++ b/usr.sbin/pkg_install/version/pkg_version.pl @@ -284,15 +284,15 @@ foreach $packageString (sort keys %currentPackages) { chdir "$PortsDirectory/$origin" or next; open PKGNAME, "$GetPkgNameCommand|"; - $portversion = <PKGNAME>; + $pkgname = <PKGNAME>; close PKGNAME; - $pkgname =~ /(.+)-(.+)/; - $portversion = $2; - - if ($portversion ne "") { - chomp $portversion; + if ($pkgname ne "") { + chomp $pkgname; + $pkgname =~ /(.+)-(.+)/; + $portversion = $2; + $currentPackages{$packageString}{'origin'} = $origin; $currentPackages{$packageString}{'portversion'} = $portversion; } |
