From d6a688de7d2ce1d5295ee711dcae2b095742d581 Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Sat, 2 Oct 2010 13:33:06 +0000 Subject: whitespace --- usr.sbin/pkg_add/OpenBSD/Add.pm | 4 ++-- usr.sbin/pkg_add/OpenBSD/ArcCheck.pm | 6 +++--- usr.sbin/pkg_add/OpenBSD/PkgCreate.pm | 6 +++--- usr.sbin/pkg_add/OpenBSD/State.pm | 4 ++-- usr.sbin/pkg_add/OpenBSD/Update.pm | 4 ++-- usr.sbin/pkg_add/OpenBSD/Vstat.pm | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm index 0b6426a8f5d..2854abd1a27 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.115 2010/08/07 21:19:04 espie Exp $ +# $OpenBSD: Add.pm,v 1.116 2010/10/02 13:33:05 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie # @@ -39,7 +39,7 @@ sub manpages_index $destdir.$k, join(@l)) if $state->verbose >= 2; } else { try { - OpenBSD::Makewhatis::merge($destdir.$k, \@l, + OpenBSD::Makewhatis::merge($destdir.$k, \@l, $state); } catchall { $state->errsay("Error in makewhatis: #1", $_); diff --git a/usr.sbin/pkg_add/OpenBSD/ArcCheck.pm b/usr.sbin/pkg_add/OpenBSD/ArcCheck.pm index d2efe04500e..86426df5113 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.18 2010/07/28 12:19:54 espie Exp $ +# $OpenBSD: ArcCheck.pm,v 1.19 2010/10/02 13:33:05 espie Exp $ # # Copyright (c) 2005-2006 Marc Espie # @@ -121,11 +121,11 @@ sub prepare_long my $filename = $item->name; my $entry = $self->prepare($filename); if (!defined $entry->{uname}) { - $self->fatal("No user name for #1 (uid #2)", + $self->fatal("No user name for #1 (uid #2)", $entry->name, $entry->{uid}); } if (!defined $entry->{gname}) { - $self->fatal("No group name for #1 (uid #2)", + $self->fatal("No group name for #1 (uid #2)", $entry->name, $entry->{gid}); } my ($prefix, $name) = split_name($entry->name); diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm index e75eccf9b4d..66845c58482 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.22 2010/07/28 12:19:54 espie Exp $ +# $OpenBSD: PkgCreate.pm,v 1.23 2010/10/02 13:33:05 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie # @@ -774,7 +774,7 @@ sub create_package local $SIG{'HUP'} = $h; local $SIG{'KILL'} = $h; local $SIG{'TERM'} = $h; - $state->{archive} = $self->create_archive($state, $wname, + $state->{archive} = $self->create_archive($state, $wname, $plist->infodir); $state->set_status("archiving"); $state->progress->visit_with_size($plist, 'create_package', $state); @@ -945,7 +945,7 @@ sub parse_and_run } if ($state->opt('n')) { - $state->{archive} = OpenBSD::Ustar->new(undef, $state, + $state->{archive} = OpenBSD::Ustar->new(undef, $state, $plist->infodir); $plist->pretend_to_archive($state); } else { diff --git a/usr.sbin/pkg_add/OpenBSD/State.pm b/usr.sbin/pkg_add/OpenBSD/State.pm index 2413f81d1c7..e19e2f1af72 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.16 2010/07/26 23:27:28 espie Exp $ +# $OpenBSD: State.pm,v 1.17 2010/10/02 13:33:05 espie Exp $ # # Copyright (c) 2007-2010 Marc Espie # @@ -46,7 +46,7 @@ sub read_file } elsif (($k, $add, $v) = m/^\s*(.*?)\s*(\+?)\=\s*(.*)\s*$/) { } else { # bad line: should we say so ? - $state->errsay("Bad line in #1: #2 (#3)", + $state->errsay("Bad line in #1: #2 (#3)", $filename, $_, $.); } # remove caps diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm index 956757765c7..aaaf7d99405 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.145 2010/08/03 14:08:49 espie Exp $ +# $OpenBSD: Update.pm,v 1.146 2010/10/02 13:33:05 espie Exp $ # # Copyright (c) 2004-2010 Marc Espie # @@ -192,7 +192,7 @@ sub process_handle $h->{update_found} = $h; $set->move_kept($h); - $self->progress_message($state, + $self->progress_message($state, "No need to update #1", $pkgname); return 0; diff --git a/usr.sbin/pkg_add/OpenBSD/Vstat.pm b/usr.sbin/pkg_add/OpenBSD/Vstat.pm index a88b0801ec1..fbbf68bbb41 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.62 2010/08/01 10:03:24 espie Exp $ +# $OpenBSD: Vstat.pm,v 1.63 2010/10/02 13:33:05 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie # @@ -216,7 +216,7 @@ sub remove_first sub remove_directory { my ($self, $name, $o) = @_; - $self->{v}[0]->{$name} = OpenBSD::Vstat::Object::Directory->new($name, + $self->{v}[0]->{$name} = OpenBSD::Vstat::Object::Directory->new($name, $self->{state}->{current_set}, $o); } -- cgit v1.2.3