diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-11-29 11:49:02 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-11-29 11:49:02 +0000 |
| commit | a08473e8e40f55174a311d782aa6bea96f670285 (patch) | |
| tree | 7f6adb1437bc94ab1826028f0de487ff57969fd6 | |
| parent | 81234400edda9522378801123bac38d504903222 (diff) | |
show old->new as everywhere else in sets.
micro-optimisation: if old pkgname is the same as new pkgname, we just
need to build the RequiredBy file, no need to adjust Requiring...
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Dependencies.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm index 3f3ac16b702..28e1c3aa124 100644 --- a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm +++ b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Dependencies.pm,v 1.87 2009/11/29 11:22:25 espie Exp $ +# $OpenBSD: Dependencies.pm,v 1.88 2009/11/29 11:49:01 espie Exp $ # # Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org> # @@ -398,7 +398,7 @@ sub adjust_old_dependency_on my $oldname = $o->pkgname; $state->say("Adjusting dependencies for ", - "$pkgname/$oldname") if $state->{beverbose}; + "$oldname->$pkgname") if $state->{beverbose}; my $d = OpenBSD::RequiredBy->new($pkgname); for my $dep (@{$o->{wantlist}}) { if (defined $set->{older}->{$dep}) { @@ -409,7 +409,7 @@ sub adjust_old_dependency_on $state->say("\t$dep") if $state->{beverbose}; $d->add($dep); OpenBSD::Replace::adjust_dependency($dep, - $oldname, $pkgname); + $oldname, $pkgname) if $oldname ne $pkgname; } } } |