From f60bfe8a2148363e71a8ca2c421bdb31dcaae815 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Dec 2019 17:28:58 +0000 Subject: [PATCH] catacomb-import-update: Investigate donor during convert The information we collect here isn't used in --convert mode. Signed-off-by: Ian Jackson --- catacomb-import-update | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/catacomb-import-update b/catacomb-import-update index fffbe7a..1d8e0ff 100755 --- a/catacomb-import-update +++ b/catacomb-import-update @@ -910,13 +910,12 @@ if ($DOCONVERT) { $DONOR_DIR =~ s{[^/]+$}{$DONOR_IMPORT_DIR} or die "$0 ?"; } else { $DONOR_DIR = "../catacomb"; + chomp ($DONOR_VERSION = capturex @with_dir, $DONOR_DIR, + "git", "describe", "--abbrev=4", "--dirty=+"); + chomp ($DONOR_REVISION = capturex @with_dir, $DONOR_DIR, + "git", "rev-parse", "HEAD"); } -chomp ($DONOR_VERSION = capturex @with_dir, $DONOR_DIR, - "git", "describe", "--abbrev=4", "--dirty=+"); -chomp ($DONOR_REVISION = capturex @with_dir, $DONOR_DIR, - "git", "rev-parse", "HEAD"); - note_path 'debian/copyright', undef; do { no autodie; mkdir $RECIP_DIR; } -- 2.30.2