The following commit has been merged in the master branch:
commit 0bdf342a69be47a5d7654114539854ea87702216
Author: Raphael Hertzog <[email protected]>
Date: Sat Jun 20 23:08:09 2009 +0200
Dpkg::Substvars: restructure to have a separate namespace for variables
The addition of “_used” in the structure was in conflict with
a possible variable of the same name. So put the variables in
a dedicated hash to avoid this conflict and rename “_used” into
“used”.
Correct the warning message too.
Also add Joachim in the THANKS file for his contribution.
diff --git a/THANKS b/THANKS
index 22a803b..9c3145e 100644
--- a/THANKS
+++ b/THANKS
@@ -79,6 +79,7 @@ Jeroen van Wolffelaar <[email protected]>
Jim Pick <[email protected]>
Jim Van Zandt <[email protected]>
Jiří Paleček <[email protected]>
+Joachim Breitner <[email protected]>
Joel Klecker <[email protected]>
Joey Hess <[email protected]>
Johannes Veser <[email protected]>
diff --git a/scripts/Dpkg/Substvars.pm b/scripts/Dpkg/Substvars.pm
index 301235c..19bfe50 100644
--- a/scripts/Dpkg/Substvars.pm
+++ b/scripts/Dpkg/Substvars.pm
@@ -1,4 +1,4 @@
-# Copyright © 2007 Raphaël Hertzog <[email protected]>
+# Copyright © 2007,2009 Raphaël Hertzog <[email protected]>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -60,16 +60,18 @@ sub new {
my ($this, $arg) = @_;
my $class = ref($this) || $this;
my $self = {
- "Newline" => "\n",
- "Space" => " ",
- "Tab" => "\t",
- "dpkg:Version" => $version,
- "dpkg:Upstream-Version" => $version,
+ vars => {
+ "Newline" => "\n",
+ "Space" => " ",
+ "Tab" => "\t",
+ "dpkg:Version" => $version,
+ "dpkg:Upstream-Version" => $version,
+ },
+ used => {},
};
- $self->{'dpkg:Upstream-Version'} =~ s/-[^-]+$//;
- $self->{_used} = {};
- $self->{_used}{$_}++ foreach keys %$self;
+ $self->{'vars'}{'dpkg:Upstream-Version'} =~ s/-[^-]+$//;
bless $self, $class;
+ $self->no_warn($_) foreach keys %{$self->{'vars'}};
if ($arg) {
$self->parse($arg);
}
@@ -84,7 +86,7 @@ Add/replace a substitution.
sub set {
my ($self, $key, $value) = @_;
- $self->{$key} = $value;
+ $self->{'vars'}{$key} = $value;
}
=item $s->get($key)
@@ -95,7 +97,7 @@ Get the value of a given substitution.
sub get {
my ($self, $key) = @_;
- return $self->{$key};
+ return $self->{'vars'}{$key};
}
=item $s->delete($key)
@@ -106,8 +108,8 @@ Remove a given substitution.
sub delete {
my ($self, $key) = @_;
- delete $self->{_used}{$key};
- return delete $self->{$key};
+ delete $self->{'used'}{$key};
+ return delete $self->{'vars'}{$key};
}
=item $s->no_warn($key)
@@ -119,7 +121,7 @@ default.
sub no_warn {
my ($self, $key) = @_;
- $self->{_used}{$key}++;
+ $self->{'used'}{$key}++;
}
=item $s->parse($file)
@@ -130,7 +132,7 @@ Add new substitutions read from $file.
sub parse {
my ($self, $varlistfile) = @_;
- $varlistfile="./$varlistfile" if $varlistfile =~ m/\s/;
+ $varlistfile = "./$varlistfile" if $varlistfile =~ m/\s/;
if (open(SV, "<", $varlistfile)) {
binmode(SV);
while (<SV>) {
@@ -139,10 +141,10 @@ sub parse {
m/^(\w[-:0-9A-Za-z]*)\=/ ||
error(_g("bad line in substvars file %s at line %d"),
$varlistfile, $.);
- $self->{$1} = $';
+ $self->{'vars'}{$1} = $';
}
close(SV);
- } elsif ($! != ENOENT ) {
+ } elsif ($! != ENOENT) {
error(_g("unable to open substvars file %s: %s"), $varlistfile, $!);
}
}
@@ -159,14 +161,14 @@ These will never be warned about when unused.
sub set_version_substvars {
my ($self, $version) = @_;
- $self->{'binary:Version'} = $version;
- $self->{'source:Version'} = $version;
- $self->{'source:Version'} =~ s/\+b[0-9]+$//;
- $self->{'source:Upstream-Version'} = $version;
- $self->{'source:Upstream-Version'} =~ s/-[^-]*$//;
+ $self->{'vars'}{'binary:Version'} = $version;
+ $self->{'vars'}{'source:Version'} = $version;
+ $self->{'vars'}{'source:Version'} =~ s/\+b[0-9]+$//;
+ $self->{'vars'}{'source:Upstream-Version'} = $version;
+ $self->{'vars'}{'source:Upstream-Version'} =~ s/-[^-]*$//;
# XXX: Source-Version is now deprecated, remove in the future.
- $self->{'Source-Version'} = $version;
+ $self->{'vars'}{'Source-Version'} = $version;
$self->no_warn($_) foreach qw/binary:Version source:Version
source:Upstream-Version Source-Version/;
}
@@ -182,7 +184,7 @@ This will never be warned about when unused.
sub set_arch_substvars {
my ($self) = @_;
- $self->{'Arch'} = get_host_arch();
+ $self->{'vars'}{'Arch'} = get_host_arch();
$self->no_warn('Arch');
}
@@ -207,9 +209,9 @@ sub substvars {
$count < $maxsubsts ||
error(_g("too many substitutions - recursive ? - in \`%s'"), $v);
$lhs = $PREMATCH; $vn = $1; $rhs = $POSTMATCH;
- if (defined($self->{$vn})) {
- $v = $lhs . $self->{$vn} . $rhs;
- $self->{_used}{$vn}++;
+ if (defined($self->{'vars'}{$vn})) {
+ $v = $lhs . $self->{'vars'}{$vn} . $rhs;
+ $self->no_warn($vn);
$count++;
} else {
warning(_g("unknown substitution variable \${%s}"), $vn);
@@ -228,13 +230,13 @@ Issues warning about any variables that were set, but not
used
sub warn_about_unused {
my ($self) = @_;
- foreach my $vn (keys %$self) {
- next if $self->{_used}{$vn};
+ foreach my $vn (keys %{$self->{'vars'}}) {
+ next if $self->{'used'}{$vn};
# Empty substitutions variables are ignored on the basis
# that they are not required in the current situation
# (example: debhelper's misc:Depends in many cases)
- next if $self->{$vn} eq "";
- warning(_g("unused substitution variables \${%s}"), $vn);
+ next if $self->{'vars'}{$vn} eq "";
+ warning(_g("unused substitution variable \${%s}"), $vn);
}
}
diff --git a/scripts/t/750_Dpkg_Substvars.t b/scripts/t/750_Dpkg_Substvars.t
index 061ac7e..5173cda 100644
--- a/scripts/t/750_Dpkg_Substvars.t
+++ b/scripts/t/750_Dpkg_Substvars.t
@@ -78,7 +78,7 @@ $output = '';
$SIG{'__WARN__'} = sub { $output .= $_[0] };
$s->warn_about_unused();
delete $SIG{'__WARN__'};
-is($output, '750_Dpkg_Substvars.t: warning: unused substitution variables
${var2}'."\n",
+is($output, "750_Dpkg_Substvars.t: warning: unused substitution variable
\${var2}\n",
, 'unused variables warnings');
# Disable warnings for a certain variable
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
