From c9868ad90e7b3382b1e7ce4a2fca9cafd398c9db Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 31 May 2019 18:43:39 +0100 Subject: [PATCH] dgit: Move quilt_need_fake_dsc into the places that require it No overall functional change. Signed-off-by: Ian Jackson --- dgit | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dgit b/dgit index 13ed4b6c..fbf5183e 100755 --- a/dgit +++ b/dgit @@ -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 "$!"; } -- 2.30.2