From d8d2347bdd45074f8f194265d948b50108d22051 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Tue, 18 Jan 2011 19:25:35 +0100 Subject: git-import-dscs: Ignore debsnap download errors to cope with binNMUs. Based on a patch from Jonathan Nieder. Closes: #610376 --- git-import-dscs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'git-import-dscs') diff --git a/git-import-dscs b/git-import-dscs index 369d7f75..87a020ed 100755 --- a/git-import-dscs +++ b/git-import-dscs @@ -53,7 +53,15 @@ def fetch_snapshots(pkg, downloaddir): dscs = None gbp.log.info("Downloading snapshots of '%s' to '%s'..." % (pkg, downloaddir)) - gbpc.Command("debsnap", [ '--force', '--destdir=%s' % (downloaddir), pkg])() + debsnap = gbpc.Command("debsnap", [ '--force', '--destdir=%s' % (downloaddir), pkg]) + try: + debsnap() + except gbpc.CommandExecFailed: + if debsnap.retcode == 2: + gbp.log.warn("Some packages failed to download. Continuing.") + pass + else: + raise dscs = glob.glob(os.path.join(downloaddir, '*.dsc')) if not dscs: -- cgit v1.2.3