summaryrefslogtreecommitdiff
path: root/infra
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-04-28 13:26:54 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-31 11:54:07 +0100
commit8c6209aa29c81ff6a02d9ab8de50b8392d0610b1 (patch)
tree9ca1e80045da5f0b84d9800b1115c95c3a69b717 /infra
parentcf3ebba7e7b87357a7b79f49f873cb869ddb63bd (diff)
Abolish $realdestrepo variable and replace with function.
Fixes a use-before-set of $realdestrepo
Diffstat (limited to 'infra')
-rwxr-xr-xinfra/dgit-repos-server20
1 files changed, 10 insertions, 10 deletions
diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 98ec16d..560f1ad 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -161,7 +161,6 @@ our $package;
our $distro;
our $suitesfile;
our $policyhook;
-our $realdestrepo;
our $destrepo;
our $workrepo;
our $keyrings;
@@ -177,6 +176,8 @@ sub debug {
print DEBUG "$debug @_\n";
}
+sub realdestrepo () { "$dgitrepos/$package.git"; }
+
sub acquirelock ($$) {
my ($lock, $must) = @_;
my $fh;
@@ -215,7 +216,7 @@ sub locksometree ($) {
}
sub lockrealtree () {
- locksometree($realdestrepo);
+ locksometree(realdestrepo);
}
sub mkrepotmp () {
@@ -287,7 +288,7 @@ sub mkrepo_fromtemplate ($) {
}
sub movetogarbage () {
- # $realdestrepo must have been locked
+ # realdestrepo must have been locked
my $garbagerepo = "$dgitrepos/${package}_garbage";
# We arrange to always keep at least one old tree, for anti-rewind
# purposes (and, I guess, recovery from mistakes). This is either
@@ -301,7 +302,7 @@ sub movetogarbage () {
}
rename "$garbagerepo", "$garbagerepo-old" or die "$garbagerepo $!";
}
- rename $realdestrepo, $garbagerepo
+ rename realdestrepo, $garbagerepo
or $! == ENOENT
or die "$garbagerepo $!";
}
@@ -347,7 +348,7 @@ sub dealwithfreshrepo () {
}
sub maybeinstallprospective () {
- return if $destrepo eq $realdestrepo;
+ return if $destrepo eq realdestrepo;
if (open REJ, "<", "$workrepo/drs-error") {
local $/ = undef;
@@ -391,8 +392,8 @@ sub maybeinstallprospective () {
movetogarbage;
}
- debug "install $destrepo => $realdestrepo";
- rename $destrepo, $realdestrepo or die $!;
+ debug "install $destrepo => ".realdestrepo;
+ rename $destrepo, realdestrepo or die $!;
remove "$destrepo.lock" or die $!;
}
@@ -813,7 +814,6 @@ sub mode_ssh () {
or reject "command string not understood";
my $method = $1;
$package = $2;
- $realdestrepo = "$dgitrepos/$package.git";
my $funcn = $method;
$funcn =~ y/-/_/;
@@ -830,8 +830,8 @@ sub mode_ssh () {
close $lfh;
- if (stat_exists $realdestrepo) {
- $destrepo = $realdestrepo;
+ if (stat_exists realdestrepo) {
+ $destrepo = realdestrepo;
} else {
debug " fixmissing $funcn";
my $fixfunc = $main::{"fixmissing__$funcn"};