diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2010-06-30 10:51:05 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2010-06-30 10:51:05 +0000 |
| commit | 63d82744c6312e762b7aac113868c98c05b105c1 (patch) | |
| tree | 3563059f5877b4d60ddaebed2c549382183ec8cd /usr.sbin | |
| parent | e5b5d4025fbfa31f721c0f96b2fbecda31e8e67c (diff) | |
allow say and errsay to work without parameters, as it's ways common.
create verbose_system up in state, because it makes sense without verbose.
Diffstat (limited to 'usr.sbin')
71 files changed, 111 insertions, 96 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm index 8a9435245ab..c0ef2da6dd0 100644 --- a/usr.sbin/pkg_add/OpenBSD/Add.pm +++ b/usr.sbin/pkg_add/OpenBSD/Add.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Add.pm,v 1.112 2010/06/30 10:41:41 espie Exp $ +# $OpenBSD: Add.pm,v 1.113 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm b/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm index 4bf1a6d4755..86b022d77bd 100644 --- a/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm +++ b/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: AddCreateDelete.pm,v 1.9 2010/06/30 10:41:41 espie Exp $ +# $OpenBSD: AddCreateDelete.pm,v 1.10 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/AddDelete.pm b/usr.sbin/pkg_add/OpenBSD/AddDelete.pm index be0daeb3e04..37a27344af8 100644 --- a/usr.sbin/pkg_add/OpenBSD/AddDelete.pm +++ b/usr.sbin/pkg_add/OpenBSD/AddDelete.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: AddDelete.pm,v 1.31 2010/06/30 10:41:41 espie Exp $ +# $OpenBSD: AddDelete.pm,v 1.32 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org> # @@ -202,13 +202,7 @@ sub vsystem if ($self->verbose < 2) { $self->system(@_); } else { - $self->print("Running #1", join(' ', @_)); - my $r = CORE::system(@_); - if ($r != 0) { - $self->say("... failed: #1", $self->child_error); - } else { - $self->say(""); - } + $self->verbose_system(@_); } } diff --git a/usr.sbin/pkg_add/OpenBSD/ArcCheck.pm b/usr.sbin/pkg_add/OpenBSD/ArcCheck.pm index 7bb35ee5239..cc73a646264 100644 --- a/usr.sbin/pkg_add/OpenBSD/ArcCheck.pm +++ b/usr.sbin/pkg_add/OpenBSD/ArcCheck.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: ArcCheck.pm,v 1.16 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: ArcCheck.pm,v 1.17 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2005-2006 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm b/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm index c95b628c817..811d908c607 100644 --- a/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm +++ b/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: CollisionReport.pm,v 1.36 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: CollisionReport.pm,v 1.37 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org> # @@ -104,7 +104,7 @@ sub collision_report($$) $state->errsay(" (different checksum)"); } } else { - $state->errsay(""); + $state->errsay; } } } diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm index ec368a1af01..bc1dd2414d9 100644 --- a/usr.sbin/pkg_add/OpenBSD/Delete.pm +++ b/usr.sbin/pkg_add/OpenBSD/Delete.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Delete.pm,v 1.104 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Delete.pm,v 1.105 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm index 7bba450c026..d73c83f9a71 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.131 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Dependencies.pm,v 1.132 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2005-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Error.pm b/usr.sbin/pkg_add/OpenBSD/Error.pm index 57125defcd7..1a2978524f0 100644 --- a/usr.sbin/pkg_add/OpenBSD/Error.pm +++ b/usr.sbin/pkg_add/OpenBSD/Error.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Error.pm,v 1.27 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Error.pm,v 1.28 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/ForwardDependencies.pm b/usr.sbin/pkg_add/OpenBSD/ForwardDependencies.pm index e1941a786d8..59ab4bb554e 100644 --- a/usr.sbin/pkg_add/OpenBSD/ForwardDependencies.pm +++ b/usr.sbin/pkg_add/OpenBSD/ForwardDependencies.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: ForwardDependencies.pm,v 1.8 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: ForwardDependencies.pm,v 1.9 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2009 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Getopt.pm b/usr.sbin/pkg_add/OpenBSD/Getopt.pm index b6bd42dc19c..427d904746a 100644 --- a/usr.sbin/pkg_add/OpenBSD/Getopt.pm +++ b/usr.sbin/pkg_add/OpenBSD/Getopt.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Getopt.pm,v 1.8 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Getopt.pm,v 1.9 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2006 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Handle.pm b/usr.sbin/pkg_add/OpenBSD/Handle.pm index 52f0db0c728..b2d7c495608 100644 --- a/usr.sbin/pkg_add/OpenBSD/Handle.pm +++ b/usr.sbin/pkg_add/OpenBSD/Handle.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Handle.pm,v 1.22 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Handle.pm,v 1.23 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2007-2009 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/IdCache.pm b/usr.sbin/pkg_add/OpenBSD/IdCache.pm index 36615620339..509bf81d9a9 100644 --- a/usr.sbin/pkg_add/OpenBSD/IdCache.pm +++ b/usr.sbin/pkg_add/OpenBSD/IdCache.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: IdCache.pm,v 1.7 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: IdCache.pm,v 1.8 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2002-2005 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Interactive.pm b/usr.sbin/pkg_add/OpenBSD/Interactive.pm index 9d9778d713b..36a14208dc7 100644 --- a/usr.sbin/pkg_add/OpenBSD/Interactive.pm +++ b/usr.sbin/pkg_add/OpenBSD/Interactive.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Interactive.pm,v 1.14 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Interactive.pm,v 1.15 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/LibSpec.pm b/usr.sbin/pkg_add/OpenBSD/LibSpec.pm index c11639d436c..bdff9e84fd5 100644 --- a/usr.sbin/pkg_add/OpenBSD/LibSpec.pm +++ b/usr.sbin/pkg_add/OpenBSD/LibSpec.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: LibSpec.pm,v 1.11 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: LibSpec.pm,v 1.12 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/LibSpec/Build.pm b/usr.sbin/pkg_add/OpenBSD/LibSpec/Build.pm index f3a9cd968ae..d0d1d6881ae 100644 --- a/usr.sbin/pkg_add/OpenBSD/LibSpec/Build.pm +++ b/usr.sbin/pkg_add/OpenBSD/LibSpec/Build.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Build.pm,v 1.4 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Build.pm,v 1.5 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Log.pm b/usr.sbin/pkg_add/OpenBSD/Log.pm index c54021b05e2..bfc8412e482 100644 --- a/usr.sbin/pkg_add/OpenBSD/Log.pm +++ b/usr.sbin/pkg_add/OpenBSD/Log.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Log.pm,v 1.2 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Log.pm,v 1.3 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Mtree.pm b/usr.sbin/pkg_add/OpenBSD/Mtree.pm index aa7cc338f36..d61f6551712 100644 --- a/usr.sbin/pkg_add/OpenBSD/Mtree.pm +++ b/usr.sbin/pkg_add/OpenBSD/Mtree.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Mtree.pm,v 1.9 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Mtree.pm,v 1.10 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2004-2005 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/OldLibs.pm b/usr.sbin/pkg_add/OpenBSD/OldLibs.pm index 69c2f396d64..e5c2d33bab7 100644 --- a/usr.sbin/pkg_add/OpenBSD/OldLibs.pm +++ b/usr.sbin/pkg_add/OpenBSD/OldLibs.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: OldLibs.pm,v 1.5 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: OldLibs.pm,v 1.6 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm b/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm index bfb3e0fb195..ceb9d5406a8 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageInfo.pm,v 1.49 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PackageInfo.pm,v 1.50 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm b/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm index 31f23ba488a..65241924b83 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageLocation.pm,v 1.21 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PackageLocation.pm,v 1.22 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm index c5bfa222336..bab06074e02 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageLocator.pm,v 1.91 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PackageLocator.pm,v 1.92 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PackageName.pm b/usr.sbin/pkg_add/OpenBSD/PackageName.pm index 653dc470d63..303d5558f72 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageName.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageName.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageName.pm,v 1.46 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PackageName.pm,v 1.47 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm index f53120316e0..f731ad37da1 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageRepository.pm,v 1.82 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PackageRepository.pm,v 1.83 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm index adcf0806afa..e1c9940e606 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Installed.pm,v 1.24 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Installed.pm,v 1.25 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository/SCP.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository/SCP.pm index 9c4a273ca6d..4fcd8924a92 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageRepository/SCP.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository/SCP.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: SCP.pm,v 1.22 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: SCP.pm,v 1.23 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm index b91db69a00a..a1ef273093e 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Source.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Source.pm,v 1.12 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Source.pm,v 1.13 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm index 461f6f7b95c..2a82b1d2d2e 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageRepositoryList.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageRepositoryList.pm,v 1.24 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PackageRepositoryList.pm,v 1.25 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm index 671569b378a..c384c8f5288 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.181 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PackingElement.pm,v 1.182 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PackingList.pm b/usr.sbin/pkg_add/OpenBSD/PackingList.pm index 4510dd24c7f..eec7c994dac 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.107 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PackingList.pm,v 1.108 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Paths.pm b/usr.sbin/pkg_add/OpenBSD/Paths.pm index 6a5b7c5e3d7..fecf8b92c82 100644 --- a/usr.sbin/pkg_add/OpenBSD/Paths.pm +++ b/usr.sbin/pkg_add/OpenBSD/Paths.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Paths.pm,v 1.14 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Paths.pm,v 1.15 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2007 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm index c6fbb1d5084..7984c2cfae7 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgAdd.pm,v 1.8 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PkgAdd.pm,v 1.9 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm b/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm index 6e170c5627e..3309dca15e5 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgCfl.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PkgCfl.pm,v 1.33 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PkgCfl.pm,v 1.34 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2005 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm b/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm index c9ca3e8f424..67acd7f53ad 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgCheck.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgCheck.pm,v 1.20 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PkgCheck.pm,v 1.21 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PkgConfig.pm b/usr.sbin/pkg_add/OpenBSD/PkgConfig.pm index 6c45d3e633d..8cb46560baf 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgConfig.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgConfig.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PkgConfig.pm,v 1.15 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PkgConfig.pm,v 1.16 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2006 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm index 71fe7b4d555..db2df070d44 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm @@ -1,6 +1,6 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgCreate.pm,v 1.18 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PkgCreate.pm,v 1.19 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm b/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm index 163c3ff9e89..c70f145eda8 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm @@ -1,6 +1,6 @@ #!/usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgDelete.pm,v 1.7 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PkgDelete.pm,v 1.8 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm b/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm index 9c452622eed..eb36cd9394e 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm @@ -1,6 +1,6 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgInfo.pm,v 1.11 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PkgInfo.pm,v 1.12 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -99,7 +99,7 @@ sub footer if ($state->opt('l')) { $state->say("#1", $state->opt('l')); } else { - $state->say(""); + $state->say; } } @@ -114,7 +114,7 @@ sub printfile $state->say("#1", $_); } close $fh; - $state->say(''); + $state->say; } sub print_description @@ -129,7 +129,7 @@ sub print_description $state->say("#1", $_); } close $fh; - $state->say(''); + $state->say; } sub hasanyopt @@ -397,7 +397,7 @@ sub print_info $state->header($handle); $state->banner("Files:"); $plist->dump_file($state->opt('K')); - $state->say(''); + $state->say; } if ($state->opt('C')) { $state->header($handle); @@ -436,7 +436,7 @@ sub print_info $state->say("#1", $plist->fullpkgpath); } else { $state->errsay("#1 has no FULLPKGPATH", $plist->pkgname); - $state->say(""); + $state->say; } } @@ -444,7 +444,7 @@ sub print_info $state->header($handle); $state->banner("Packing-list:"); $plist->write(\*STDOUT); - $state->say(''); + $state->say; } $state->footer($handle); } diff --git a/usr.sbin/pkg_add/OpenBSD/PkgSpec.pm b/usr.sbin/pkg_add/OpenBSD/PkgSpec.pm index 08406edf503..5d26b319830 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgSpec.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgSpec.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PkgSpec.pm,v 1.30 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: PkgSpec.pm,v 1.31 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm b/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm index 12ca300b250..19acb69737a 100644 --- a/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm +++ b/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: ProgressMeter.pm,v 1.35 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: ProgressMeter.pm,v 1.36 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm b/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm index f632ee308b0..8d9f8e43b9c 100644 --- a/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm +++ b/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Term.pm,v 1.11 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Term.pm,v 1.12 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2004-2007 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Replace.pm b/usr.sbin/pkg_add/OpenBSD/Replace.pm index 7d0473db7ba..d28cdd79374 100644 --- a/usr.sbin/pkg_add/OpenBSD/Replace.pm +++ b/usr.sbin/pkg_add/OpenBSD/Replace.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Replace.pm,v 1.75 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Replace.pm,v 1.76 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/RequiredBy.pm b/usr.sbin/pkg_add/OpenBSD/RequiredBy.pm index f1d2e9d4964..4b58bdeb850 100644 --- a/usr.sbin/pkg_add/OpenBSD/RequiredBy.pm +++ b/usr.sbin/pkg_add/OpenBSD/RequiredBy.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: RequiredBy.pm,v 1.22 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: RequiredBy.pm,v 1.23 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2005 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Search.pm b/usr.sbin/pkg_add/OpenBSD/Search.pm index c5132f52821..ebe29a5f4c7 100644 --- a/usr.sbin/pkg_add/OpenBSD/Search.pm +++ b/usr.sbin/pkg_add/OpenBSD/Search.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Search.pm,v 1.23 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Search.pm,v 1.24 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2007 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/SharedItems.pm b/usr.sbin/pkg_add/OpenBSD/SharedItems.pm index d5e500ba059..fd1df6afc24 100644 --- a/usr.sbin/pkg_add/OpenBSD/SharedItems.pm +++ b/usr.sbin/pkg_add/OpenBSD/SharedItems.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: SharedItems.pm,v 1.25 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: SharedItems.pm,v 1.26 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2004-2006 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm b/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm index 2bdbd0c3297..cd7775e9d77 100644 --- a/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm +++ b/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: SharedLibs.pm,v 1.50 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: SharedLibs.pm,v 1.51 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Signature.pm b/usr.sbin/pkg_add/OpenBSD/Signature.pm index c7dd3eafbd0..b4cd10312a4 100644 --- a/usr.sbin/pkg_add/OpenBSD/Signature.pm +++ b/usr.sbin/pkg_add/OpenBSD/Signature.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Signature.pm,v 1.7 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Signature.pm,v 1.8 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/State.pm b/usr.sbin/pkg_add/OpenBSD/State.pm index c5d2d544bd2..3c847c88066 100644 --- a/usr.sbin/pkg_add/OpenBSD/State.pm +++ b/usr.sbin/pkg_add/OpenBSD/State.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: State.pm,v 1.8 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: State.pm,v 1.9 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org> # @@ -178,7 +178,11 @@ sub print sub say { my $self = shift; - $self->_print($self->f(@_), "\n"); + if (@_ == 0) { + $self->_print("\n"); + } else { + $self->_print($self->f(@_), "\n"); + } } sub errprint @@ -190,7 +194,11 @@ sub errprint sub errsay { my $self = shift; - $self->_errprint($self->f(@_), "\n"); + if (@_ == 0) { + $self->_errprint("\n"); + } else { + $self->_errprint($self->f(@_), "\n"); + } } sub do_options @@ -302,6 +310,19 @@ sub system return $r; } +sub verbose_system +{ + my $self = shift; + + $self->print("Running #1", join(' ', @_)); + my $r = CORE::system(@_); + if ($r != 0) { + $self->say("... failed: #1", $self->child_error); + } else { + $self->say; + } +} + sub copy_file { my $self = shift; diff --git a/usr.sbin/pkg_add/OpenBSD/Subst.pm b/usr.sbin/pkg_add/OpenBSD/Subst.pm index 3466029f0ff..875b5ff8dbf 100644 --- a/usr.sbin/pkg_add/OpenBSD/Subst.pm +++ b/usr.sbin/pkg_add/OpenBSD/Subst.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Subst.pm,v 1.11 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Subst.pm,v 1.12 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2008 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Temp.pm b/usr.sbin/pkg_add/OpenBSD/Temp.pm index 13dad8d55a9..aed255ff480 100644 --- a/usr.sbin/pkg_add/OpenBSD/Temp.pm +++ b/usr.sbin/pkg_add/OpenBSD/Temp.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Temp.pm,v 1.19 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Temp.pm,v 1.20 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2005 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Tracker.pm b/usr.sbin/pkg_add/OpenBSD/Tracker.pm index bdb02185657..e094c12d6aa 100644 --- a/usr.sbin/pkg_add/OpenBSD/Tracker.pm +++ b/usr.sbin/pkg_add/OpenBSD/Tracker.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Tracker.pm,v 1.22 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Tracker.pm,v 1.23 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2009 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm index 1926f3ea5f9..3c011489829 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.140 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Update.pm,v 1.141 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm index 07986c53d68..f766b4f8bd3 100644 --- a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm +++ b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: UpdateSet.pm,v 1.59 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: UpdateSet.pm,v 1.60 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Ustar.pm b/usr.sbin/pkg_add/OpenBSD/Ustar.pm index 12486dedfd8..64cd861425b 100644 --- a/usr.sbin/pkg_add/OpenBSD/Ustar.pm +++ b/usr.sbin/pkg_add/OpenBSD/Ustar.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Ustar.pm,v 1.58 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Ustar.pm,v 1.59 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2002-2007 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/Vstat.pm b/usr.sbin/pkg_add/OpenBSD/Vstat.pm index c027a5dc467..b977317badf 100644 --- a/usr.sbin/pkg_add/OpenBSD/Vstat.pm +++ b/usr.sbin/pkg_add/OpenBSD/Vstat.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Vstat.pm,v 1.60 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: Vstat.pm,v 1.61 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/md5.pm b/usr.sbin/pkg_add/OpenBSD/md5.pm index ef201c86503..0dd8e091c8f 100644 --- a/usr.sbin/pkg_add/OpenBSD/md5.pm +++ b/usr.sbin/pkg_add/OpenBSD/md5.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: md5.pm,v 1.10 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: md5.pm,v 1.11 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/OpenBSD/x509.pm b/usr.sbin/pkg_add/OpenBSD/x509.pm index 5270263e192..7dc5b0f0bdc 100644 --- a/usr.sbin/pkg_add/OpenBSD/x509.pm +++ b/usr.sbin/pkg_add/OpenBSD/x509.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: x509.pm,v 1.7 2010/06/30 10:41:42 espie Exp $ +# $OpenBSD: x509.pm,v 1.8 2010/06/30 10:51:04 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # diff --git a/usr.sbin/pkg_add/pkg_merge b/usr.sbin/pkg_add/pkg_merge index 71b682b79f5..b9ef31b5803 100644 --- a/usr.sbin/pkg_add/pkg_merge +++ b/usr.sbin/pkg_add/pkg_merge @@ -1,6 +1,6 @@ #! /usr/bin/perl # Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org> -# $OpenBSD: pkg_merge,v 1.17 2010/06/30 10:41:41 espie Exp $ +# $OpenBSD: pkg_merge,v 1.18 2010/06/30 10:51:04 espie Exp $ # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above diff --git a/usr.sbin/pkg_add/pod/OpenBSD::Getopt.pod b/usr.sbin/pkg_add/pod/OpenBSD::Getopt.pod index aaf73da3d9e..9f383699ebb 100644 --- a/usr.sbin/pkg_add/pod/OpenBSD::Getopt.pod +++ b/usr.sbin/pkg_add/pod/OpenBSD::Getopt.pod @@ -1,4 +1,4 @@ -$OpenBSD: OpenBSD::Getopt.pod,v 1.3 2009/12/17 11:41:30 espie Exp $ +$OpenBSD: OpenBSD::Getopt.pod,v 1.4 2010/06/30 10:51:04 espie Exp $ =head1 NAME diff --git a/usr.sbin/pkg_add/pod/OpenBSD::IdCache.pod b/usr.sbin/pkg_add/pod/OpenBSD::IdCache.pod index 80b94fb0aaa..0bdfa8d8ce7 100644 --- a/usr.sbin/pkg_add/pod/OpenBSD::IdCache.pod +++ b/usr.sbin/pkg_add/pod/OpenBSD::IdCache.pod @@ -1,4 +1,4 @@ -$OpenBSD: OpenBSD::IdCache.pod,v 1.2 2005/06/13 11:33:07 espie Exp $ +$OpenBSD: OpenBSD::IdCache.pod,v 1.3 2010/06/30 10:51:04 espie Exp $ =head1 NAME diff --git a/usr.sbin/pkg_add/pod/OpenBSD::Intro.pod b/usr.sbin/pkg_add/pod/OpenBSD::Intro.pod index f2b80132e56..6cb4a7bed40 100644 --- a/usr.sbin/pkg_add/pod/OpenBSD::Intro.pod +++ b/usr.sbin/pkg_add/pod/OpenBSD::Intro.pod @@ -1,4 +1,4 @@ -$OpenBSD: OpenBSD::Intro.pod,v 1.14 2010/06/18 10:56:32 espie Exp $ +$OpenBSD: OpenBSD::Intro.pod,v 1.15 2010/06/30 10:51:04 espie Exp $ =head1 NAME @@ -130,7 +130,7 @@ whole system. An update set is simply a minimal bag of packages, with old packages that are going to be removed, new packages that are going to replace them, and an area to record related ongoing computations. The old set may be empty, the new set may be empty, and in all cases, -the update set shall be small (as small as possible). +the update set shall be small (as small as possible). We have already met with update situations where dependencies between packages invert (A-1.0 depends on B-1.0, but B-0.0 depends on A-0.0), or where files move between packages, which in @@ -219,7 +219,7 @@ Most commands are now implemented as perl modules, with C<pkg(1)> requiring the correct module C<M>, and invoking C<M-E<gt>parse_and_run("command")>. All those commands use a class derived from C<OpenBSD::State> for user -interaction. Among other things, C<OpenBSD::State> provides for printable, +interaction. Among other things, C<OpenBSD::State> provides for printable, translatable messages, consistent option handling and usage messages. All commands that provide a progress meter use the derived module @@ -258,7 +258,7 @@ through all installed packages and removes stuff that's no longer used Package replacement is more complicated. It relies on package names and conflict markers. -In normal usage, L<pkg_add(1)> installs only new stuff, and checks that all +In normal usage, L<pkg_add(1)> installs only new stuff, and checks that all files in the new package don't already exist in the file system. By convention, packages with the same stem are assumed to be different versions of the same package, e.g., screen-1.0 and screen-1.1 correspond @@ -401,7 +401,7 @@ to speed things up. Interacts with the global tracker object. =item OpenBSD::Error -handles signal registration, the exception mechanism, and auto-caching +handles signal registration, the exception mechanism, and auto-caching methods. Most I/O operations have moved to C<OpenBSD::State>. =item OpenBSD::Getopt @@ -534,7 +534,7 @@ confuse with cryptographic signatures, as handled through C<OpenBSD::x509>). =item OpenBSD::State -base class to UI and option handling. +base class to UI and option handling. =item OpenBSD::Subst diff --git a/usr.sbin/pkg_add/pod/OpenBSD::Mtree.pod b/usr.sbin/pkg_add/pod/OpenBSD::Mtree.pod index 1fdc6bd8764..ed2ce16b44f 100644 --- a/usr.sbin/pkg_add/pod/OpenBSD::Mtree.pod +++ b/usr.sbin/pkg_add/pod/OpenBSD::Mtree.pod @@ -1,4 +1,4 @@ -$OpenBSD: OpenBSD::Mtree.pod,v 1.3 2009/12/17 11:41:30 espie Exp $ +$OpenBSD: OpenBSD::Mtree.pod,v 1.4 2010/06/30 10:51:04 espie Exp $ =head1 NAME diff --git a/usr.sbin/pkg_add/pod/OpenBSD::PackageName.pod b/usr.sbin/pkg_add/pod/OpenBSD::PackageName.pod index 7190feeabe7..c0a1f9a9e43 100644 --- a/usr.sbin/pkg_add/pod/OpenBSD::PackageName.pod +++ b/usr.sbin/pkg_add/pod/OpenBSD::PackageName.pod @@ -1,4 +1,4 @@ -$OpenBSD: OpenBSD::PackageName.pod,v 1.3 2009/12/17 11:41:30 espie Exp $ +$OpenBSD: OpenBSD::PackageName.pod,v 1.4 2010/06/30 10:51:04 espie Exp $ =head1 NAME diff --git a/usr.sbin/pkg_add/pod/OpenBSD::PackingElement.pod b/usr.sbin/pkg_add/pod/OpenBSD::PackingElement.pod index c8153f5b2ec..f9aad797d1b 100644 --- a/usr.sbin/pkg_add/pod/OpenBSD::PackingElement.pod +++ b/usr.sbin/pkg_add/pod/OpenBSD::PackingElement.pod @@ -1,4 +1,4 @@ -$OpenBSD: OpenBSD::PackingElement.pod,v 1.9 2009/12/17 11:41:30 espie Exp $ +$OpenBSD: OpenBSD::PackingElement.pod,v 1.10 2010/06/30 10:51:04 espie Exp $ =head1 NAME diff --git a/usr.sbin/pkg_add/pod/OpenBSD::PackingList.pod b/usr.sbin/pkg_add/pod/OpenBSD::PackingList.pod index 956b809e47a..221c543c1bc 100644 --- a/usr.sbin/pkg_add/pod/OpenBSD::PackingList.pod +++ b/usr.sbin/pkg_add/pod/OpenBSD::PackingList.pod @@ -1,4 +1,4 @@ -$OpenBSD: OpenBSD::PackingList.pod,v 1.8 2009/12/17 11:41:30 espie Exp $ +$OpenBSD: OpenBSD::PackingList.pod,v 1.9 2010/06/30 10:51:04 espie Exp $ =head1 NAME diff --git a/usr.sbin/pkg_add/pod/OpenBSD::PkgCfl.pod b/usr.sbin/pkg_add/pod/OpenBSD::PkgCfl.pod index de3d92be219..b835dfd6b04 100644 --- a/usr.sbin/pkg_add/pod/OpenBSD::PkgCfl.pod +++ b/usr.sbin/pkg_add/pod/OpenBSD::PkgCfl.pod @@ -1,4 +1,4 @@ -$OpenBSD: OpenBSD::PkgCfl.pod,v 1.2 2009/12/17 11:41:30 espie Exp $ +$OpenBSD: OpenBSD::PkgCfl.pod,v 1.3 2010/06/30 10:51:04 espie Exp $ =head1 NAME diff --git a/usr.sbin/pkg_add/pod/OpenBSD::PkgSpec.pod b/usr.sbin/pkg_add/pod/OpenBSD::PkgSpec.pod index f06bbd5afe6..bf4b7f5934f 100644 --- a/usr.sbin/pkg_add/pod/OpenBSD::PkgSpec.pod +++ b/usr.sbin/pkg_add/pod/OpenBSD::PkgSpec.pod @@ -1,4 +1,4 @@ -$OpenBSD: OpenBSD::PkgSpec.pod,v 1.7 2010/01/12 10:14:37 espie Exp $ +$OpenBSD: OpenBSD::PkgSpec.pod,v 1.8 2010/06/30 10:51:04 espie Exp $ =head1 NAME @@ -22,6 +22,6 @@ C<@sublist> will only hold the package names that match the specification. For performance reason, the result may contain duplicates. -Note that any pattern will create a C<PkgSpec> object. If the syntax is +Note that any pattern will create a C<PkgSpec> object. If the syntax is incorrect, the resulting object won't match anything. Use C<$spec-E<gt>is_valid> to check for correctness. diff --git a/usr.sbin/pkg_add/pod/OpenBSD::RequiredBy.pod b/usr.sbin/pkg_add/pod/OpenBSD::RequiredBy.pod index 88a7fc8df48..bc2f98a92be 100644 --- a/usr.sbin/pkg_add/pod/OpenBSD::RequiredBy.pod +++ b/usr.sbin/pkg_add/pod/OpenBSD::RequiredBy.pod @@ -1,4 +1,4 @@ -$OpenBSD: OpenBSD::RequiredBy.pod,v 1.4 2009/12/17 11:41:30 espie Exp $ +$OpenBSD: OpenBSD::RequiredBy.pod,v 1.5 2010/06/30 10:51:04 espie Exp $ =head1 NAME @@ -8,7 +8,7 @@ OpenBSD::RequiredBy - manage installed package dependencies use OpenBSD::RequiredBy; - + # let's do things for real our $not = 0; diff --git a/usr.sbin/pkg_add/pod/OpenBSD::Search.pod b/usr.sbin/pkg_add/pod/OpenBSD::Search.pod index 5e2197d0291..8f4de16c679 100644 --- a/usr.sbin/pkg_add/pod/OpenBSD::Search.pod +++ b/usr.sbin/pkg_add/pod/OpenBSD::Search.pod @@ -1,4 +1,4 @@ -$OpenBSD: OpenBSD::Search.pod,v 1.3 2009/12/17 11:41:30 espie Exp $ +$OpenBSD: OpenBSD::Search.pod,v 1.4 2010/06/30 10:51:04 espie Exp $ =head1 NAME diff --git a/usr.sbin/pkg_add/pod/OpenBSD::State.pod b/usr.sbin/pkg_add/pod/OpenBSD::State.pod index f589b5a8d94..3571c03d980 100644 --- a/usr.sbin/pkg_add/pod/OpenBSD::State.pod +++ b/usr.sbin/pkg_add/pod/OpenBSD::State.pod @@ -1,4 +1,4 @@ -$OpenBSD: OpenBSD::State.pod,v 1.1 2010/06/25 12:03:54 espie Exp $ +$OpenBSD: OpenBSD::State.pod,v 1.2 2010/06/30 10:51:04 espie Exp $ =head1 NAME @@ -54,7 +54,7 @@ Meant to be overridden. Always call C<$state-E<gt>SUPER::init(@params)> at end. =item $state->handle_options($opt_string, @usage); handle options to relevant to this command. Takes a C<OpenBSD::Getopt> -C<$opt_string>, and a set of C<@usage> lines that will be printed if +C<$opt_string>, and a set of C<@usage> lines that will be printed if necessary. Option results are stored in the C<$state-E<gt>{opt}> hash. This can diff --git a/usr.sbin/pkg_add/pod/OpenBSD::Ustar.pod b/usr.sbin/pkg_add/pod/OpenBSD::Ustar.pod index 52447a1e050..08df5e3d5db 100644 --- a/usr.sbin/pkg_add/pod/OpenBSD::Ustar.pod +++ b/usr.sbin/pkg_add/pod/OpenBSD::Ustar.pod @@ -1,4 +1,4 @@ -$OpenBSD: OpenBSD::Ustar.pod,v 1.13 2009/12/17 11:41:30 espie Exp $ +$OpenBSD: OpenBSD::Ustar.pod,v 1.14 2010/06/30 10:51:04 espie Exp $ =head1 NAME diff --git a/usr.sbin/pkg_add/pod/OpenBSD::Vstat.pod b/usr.sbin/pkg_add/pod/OpenBSD::Vstat.pod index b5648e03eb0..384c0acae08 100644 --- a/usr.sbin/pkg_add/pod/OpenBSD::Vstat.pod +++ b/usr.sbin/pkg_add/pod/OpenBSD::Vstat.pod @@ -1,4 +1,4 @@ -$OpenBSD: OpenBSD::Vstat.pod,v 1.6 2010/06/18 10:56:32 espie Exp $ +$OpenBSD: OpenBSD::Vstat.pod,v 1.7 2010/06/30 10:51:04 espie Exp $ =head1 NAME @@ -24,7 +24,7 @@ before doing them for real. The constructor C<new> expect a C<$state> object, that is, an object with C<$state-E<gt>{not}> and C<$state-E<gt>errsay> defined. -Operations on the C<Vstat> object can modify C<$state-E<gt>{problems}> +Operations on the C<Vstat> object can modify C<$state-E<gt>{problems}> and C<$state-E<gt>{overflow}>. The method C<add> (respectively C<remove>) can be used to add a filename to |