diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-12-28 14:00:22 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-12-28 14:00:22 +0000 |
| commit | 6f1b8a91578bb35023df1e3f79a973a0792982f9 (patch) | |
| tree | 85df7705a2ac1956cec0c09524c269d9fc221d40 /usr.sbin/pkg_add | |
| parent | 72ea6221a88cd4f2d95b39e2ade757014ed3d97d (diff) | |
clearer error/warning
Diffstat (limited to 'usr.sbin/pkg_add')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Update.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm index 43c7956e1e4..743c6b778a0 100644 --- a/usr.sbin/pkg_add/OpenBSD/Update.pm +++ b/usr.sbin/pkg_add/OpenBSD/Update.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Update.pm,v 1.49 2004/12/28 13:56:08 espie Exp $ +# $OpenBSD: Update.pm,v 1.50 2004/12/28 14:00:21 espie Exp $ # # Copyright (c) 2004 Marc Espie <espie@openbsd.org> # @@ -147,10 +147,10 @@ sub validate_depend return unless OpenBSD::PkgSpec::match($self->{pattern}, $toreplace); if (!OpenBSD::PkgSpec::match($self->{pattern}, $replacement)) { if ($state->{forced}->{updatedepends}) { - Warn "Forward dependency of $wanting on $toreplace doesn't match, forcing it\n"; + Warn "Forward dependency of $wanting on $toreplace doesn't match $replacement, forcing it\n"; } else { $state->{okay} = 0; - Warn "Can't update forward dependency of $wanting on $toreplace\n"; + Warn "Can't update forward dependency of $wanting on $toreplace: $replacement doesn't match\n"; } } } @@ -212,10 +212,10 @@ sub validate_depend return unless OpenBSD::PkgSpec::match($self->{pattern}, $toreplace); if (!OpenBSD::PkgSpec::match($self->{pattern}, $replacement)) { if ($state->{forced}->{updatedepends}) { - Warn "Forward dependency of $wanting on $toreplace doesn't match, forcing it\n"; + Warn "Forward dependency of $wanting on $toreplace doesn't match $replacement, forcing it\n"; } else { $state->{okay} = 0; - Warn "Can't update forward dependency of $wanting on $toreplace\n"; + Warn "Can't update forward dependency of $wanting on $toreplace: $replacement doesn't match\n"; } } } @@ -230,10 +230,10 @@ sub validate_depend return unless OpenBSD::PkgSpec::match($self->{pattern}, $toreplace); if (!OpenBSD::PkgSpec::match($self->{pattern}, $replacement)) { if ($state->{forced}->{updatedepends}) { - Warn "Forward dependency of $wanting on $toreplace doesn't match, forcing it\n"; + Warn "Forward dependency of $wanting on $toreplace doesn't match $replacement, forcing it\n"; } else { $state->{okay} = 0; - Warn "Can't update forward dependency of $wanting on $toreplace\n"; + Warn "Can't update forward dependency of $wanting on $toreplace: $replacement doesn't match\n"; } } } |