diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-05-31 18:43:39 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-28 12:45:38 +0100 |
commit | c9868ad90e7b3382b1e7ce4a2fca9cafd398c9db (patch) | |
tree | 65b2f249b911ae8f469035a456c2d321d93ad6df /dgit | |
parent | 53cff81bf89593f3ba347e2d8003197a6cd4bb01 (diff) |
dgit: Move quilt_need_fake_dsc into the places that require it
No overall functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -4495,7 +4495,6 @@ END if (quiltmode_splitbrain()) { $do_split_brain = 1; changedir $playground; - quilt_need_fake_dsc($upstreamversion); my $cachekey; ($dgithead, $cachekey) = quilt_check_splitbrain_cache($actualhead, $upstreamversion); @@ -5950,6 +5949,7 @@ sub quilt_fakedsc2unapplied ($$) { # must be run in the playground # quilt_need_fake_dsc must have been called + quilt_need_fake_dsc($upstreamversion); runcmd qw(sh -ec), 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null'; @@ -5977,6 +5977,8 @@ sub quilt_check_splitbrain_cache ($$) { # Computes the cache key and looks in the cache. # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey) + quilt_need_fake_dsc($upstreamversion); + my $splitbrain_cachekey; progress f_ @@ -6134,8 +6136,6 @@ sub quilt_fixup_multipatch ($$$) { chdir '..'; } - quilt_need_fake_dsc($upstreamversion); - if (quiltmode_splitbrain()) { my $cachehit; ($cachehit, $splitbrain_cachekey) = @@ -6903,7 +6903,6 @@ sub cmd_print_unapplied_treeish { prep_ud(); changedir $playground; my $uv = upstreamversion $version; - quilt_need_fake_dsc($uv); my $u = quilt_fakedsc2unapplied($headref, $uv); print $u, "\n" or confess "$!"; } |