The following commit has been merged in the master branch:
commit 32bb29c7bffd9354cdaea4ad30fc84d02ea57bde
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sun Dec 7 00:25:51 2008 +0200
scripts: Do not mark internerr strings for translation
diff --git a/ChangeLog b/ChangeLog
index 8b9d1fd..874b56e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2008-12-08 Guillem Jover <[EMAIL PROTECTED]>
+ * scripts/Dpkg/Deps.pm (implies): Do not mark internerr strings for
+ translation.
+ * scripts/Dpkg/Fields.pm (output): Likewise.
+ * scripts/Dpkg/Source/Package.pm (add_file): Likewise.
+
+2008-12-08 Guillem Jover <[EMAIL PROTECTED]>
+
* scripts/Dpkg/Deps.pm (parse): Do not use sprintf for warning.
(implies): Do not use sprintf for internerr.
diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index e596880..6c4b9c9 100644
--- a/scripts/Dpkg/Deps.pm
+++ b/scripts/Dpkg/Deps.pm
@@ -623,7 +623,7 @@ sub implies {
}
return $res;
} else {
- internerr(_g("Dpkg::Deps::Simple can't evaluate implication with a
%s!"),
+ internerr("Dpkg::Deps::Simple can't evaluate implication with a %s!",
ref($o));
}
}
diff --git a/scripts/Dpkg/Fields.pm b/scripts/Dpkg/Fields.pm
index 3bb702c..5cb090b 100644
--- a/scripts/Dpkg/Fields.pm
+++ b/scripts/Dpkg/Fields.pm
@@ -228,12 +228,12 @@ sub output {
}
$v =~ m/\S/ || next; # delete whitespace-only fields
$v =~ m/\n\S/ &&
- internerr(_g("field %s has newline then non whitespace >%s<"),
+ internerr("field %s has newline then non whitespace >%s<",
$f, $v);
$v =~ m/\n[ \t]*\n/ &&
- internerr(_g("field %s has blank lines >%s<"), $f, $v);
+ internerr("field %s has blank lines >%s<", $f, $v);
$v =~ m/\n$/ &&
- internerr(_g("field %s has trailing newline >%s<"), $f, $v);
+ internerr("field %s has trailing newline >%s<", $f, $v);
if (defined($substvars)) {
$v =~ s/,[\s,]*,/,/g;
$v =~ s/^\s*,\s*//;
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index 0794886..5014dc3 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -401,7 +401,7 @@ sub add_file {
my ($self, $filename) = @_;
my ($fn, $dir) = fileparse($filename);
if (exists $self->{'files'}{$fn}) {
- internerr(_g("tried to add file `%s' twice"), $fn);
+ internerr("tried to add file '%s' twice", $fn);
}
my (%sums, $size);
getchecksums($filename, \%sums, \$size);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
