diff options
| author | Guillem Jover <guillem@debian.org> | 2014-01-28 01:31:12 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2014-04-21 16:29:57 +0200 |
| commit | 31f280b1d73f8a76fe7ca0d58a45b41508d2a751 (patch) | |
| tree | b4dbd79243e2fe5565f1c3a5f42a1a68e3657e85 /scripts/dpkg-gencontrol.pl | |
| parent | be7da07bbc26cf9b799fa6425b60025ab0e91956 (diff) | |
| download | dpkg-31f280b1d73f8a76fe7ca0d58a45b41508d2a751.tar.gz | |
dpkg-gencontrol: Move setting of fallback $forcefilename before locking
Diffstat (limited to 'scripts/dpkg-gencontrol.pl')
| -rwxr-xr-x | scripts/dpkg-gencontrol.pl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl index 5f8fa90ef..4c27b04e0 100755 --- a/scripts/dpkg-gencontrol.pl +++ b/scripts/dpkg-gencontrol.pl @@ -369,6 +369,11 @@ for my $f (keys %remove) { delete $fields->{$f}; } +my $sversion = $fields->{'Version'}; +$sversion =~ s/^\d+://; +$forcefilename //= sprintf('%s_%s_%s.%s', $oppackage, $sversion, + $fields->{'Architecture'} || '', $pkg_type); + # Obtain a lock on debian/control to avoid simultaneous updates # of debian/files when parallel building is in use my $lockfh; @@ -398,10 +403,6 @@ if (open(my $fileslist_fh, '<', $fileslistfile)) { } elsif ($! != ENOENT) { syserr(_g('read old files list file')); } -my $sversion = $fields->{'Version'}; -$sversion =~ s/^\d+://; -$forcefilename //= sprintf('%s_%s_%s.%s', $oppackage, $sversion, - $fields->{'Architecture'} || '', $pkg_type); print { $fileslistnew_fh } $substvars->substvars(sprintf("%s %s %s\n", |