summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2012-04-28 12:00:11 +0000
committerMarc Espie <espie@cvs.openbsd.org>2012-04-28 12:00:11 +0000
commit61e4f45d56b5616abc3fefd814f16133d378b6e2 (patch)
treec6b800d6bc9b1e04df3bde97c8150101e1cb66f3
parent7a07ed50371f2da8c77aee54fc925341d133a411 (diff)
zap blank spaces
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Add.pm6
-rw-r--r--usr.sbin/pkg_add/OpenBSD/CollisionReport.pm4
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PackingElement.pm8
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PkgAdd.pm4
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Replace.pm4
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Ustar.pm8
6 files changed, 17 insertions, 17 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm
index 8c790f7cdd7..f5c4a65a8f5 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.129 2012/01/16 08:42:38 schwarze Exp $
+# $OpenBSD: Add.pm,v 1.130 2012/04/28 12:00:10 espie Exp $
#
# Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
#
@@ -360,7 +360,7 @@ sub prepare_for_addition
$state->{problems}++;
return;
}
- my $s = $state->vstat->add($fname, $self->{tieto} ? 0 : $self->{size},
+ my $s = $state->vstat->add($fname, $self->{tieto} ? 0 : $self->{size},
$pkgname);
return unless defined $s;
if ($s->ro) {
@@ -705,7 +705,7 @@ sub copy_info
require File::Copy;
File::Copy::move($self->fullname, $dest) or
- $state->errsay("Problem while moving #1 into #2: #3",
+ $state->errsay("Problem while moving #1 into #2: #3",
$self->fullname, $dest, $!);
}
diff --git a/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm b/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm
index 8a517a2659c..d82647aed91 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.43 2011/12/03 16:45:50 espie Exp $
+# $OpenBSD: CollisionReport.pm,v 1.44 2012/04/28 12:00:10 espie Exp $
#
# Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org>
#
@@ -91,7 +91,7 @@ sub collision_report
for my $pkg (sort keys %$bypkg) {
for my $item (sort @{$bypkg->{$pkg}}) {
$found++;
- $state->errsay("\t#1 (#2 and #3)", $item, $pkg,
+ $state->errsay("\t#1 (#2 and #3)", $item, $pkg,
$extra{$item});
}
if ($pkg =~ m/^(?:partial\-|borked\.\d+$)/o) {
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
index 5154d38528f..9eab17c4c19 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.201 2011/11/16 16:38:34 schwarze Exp $
+# $OpenBSD: PackingElement.pm,v 1.202 2012/04/28 12:00:10 espie Exp $
#
# Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
#
@@ -899,8 +899,8 @@ sub new
$ftp =~ s/^\"(.*)\"$/$1/;
$ftp =~ s/^\'(.*)\'$/$1/;
bless { subdir => $subdir,
- path => OpenBSD::PkgPath->new($subdir),
- cdrom => $cdrom,
+ path => OpenBSD::PkgPath->new($subdir),
+ cdrom => $cdrom,
ftp => $ftp}, $class;
}
@@ -1046,7 +1046,7 @@ sub category() { "pkgpath" }
sub new
{
my ($class, $fullpkgpath) = @_;
- bless {name => $fullpkgpath,
+ bless {name => $fullpkgpath,
path => OpenBSD::PkgPath::WithOpts->new($fullpkgpath)}, $class;
}
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
index 567fe05b2ec..df002f3051e 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.33 2011/08/26 08:46:10 espie Exp $
+# $OpenBSD: PkgAdd.pm,v 1.34 2012/04/28 12:00:10 espie Exp $
#
# Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
#
@@ -92,7 +92,7 @@ sub tie_files
return unless (stat _)[7] == $self->{size};
$self->{tieto} = $tied;
$tied->{tied} = 1;
- $state->say("Tieing #1 to #2", $self->stringize,
+ $state->say("Tieing #1 to #2", $self->stringize,
$tied->stringize) if $state->verbose >= 3;
}
}
diff --git a/usr.sbin/pkg_add/OpenBSD/Replace.pm b/usr.sbin/pkg_add/OpenBSD/Replace.pm
index 373e0a8dcf3..9ab688218d3 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.83 2011/08/23 10:32:27 espie Exp $
+# $OpenBSD: Replace.pm,v 1.84 2012/04/28 12:00:10 espie Exp $
#
# Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
#
@@ -83,7 +83,7 @@ sub extract
if ($self->{tieto}) {
my $src = $self->{tieto}->realname($state);
unlink($tempname);
- $state->say("linking #1 to #2", $src, $tempname)
+ $state->say("linking #1 to #2", $src, $tempname)
if $state->verbose >= 3;
if (link($src, $tempname) ||
$state->copy_file($src, $tempname)) {
diff --git a/usr.sbin/pkg_add/OpenBSD/Ustar.pm b/usr.sbin/pkg_add/OpenBSD/Ustar.pm
index 332fbe79e14..66e21531fd7 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.71 2011/03/20 08:17:24 espie Exp $
+# $OpenBSD: Ustar.pm,v 1.72 2012/04/28 12:00:10 espie Exp $
#
# Copyright (c) 2002-2007 Marc Espie <espie@openbsd.org>
#
@@ -75,8 +75,8 @@ sub set_description
sub fatal
{
my ($self, $msg, @args) = @_;
- $self->{state}->fatal("Ustar [#1][#2]: #3",
- $self->{description} // '?', $self->{lastname} // '?',
+ $self->{state}->fatal("Ustar [#1][#2]: #3",
+ $self->{description} // '?', $self->{lastname} // '?',
$self->{state}->f($msg, @args));
}
@@ -187,7 +187,7 @@ sub next
$self->fatal("Unsupported type #1", $type);
}
if (!$result->isFile && $result->{size} != 0) {
- $self->fatal("Bad archive: non null size for #1 (#2)",
+ $self->fatal("Bad archive: non null size for #1 (#2)",
$types->{$type}, $result->{name});
}