[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[dak/master] daklib/archive.py: don't fail in prepare() if the .dsc is invalid



We only need the .dsc here to try and grab any files not included in the
upload. If there is an error loading the .dsc, do not throw an exception here,
but do so later instead.
---
 daklib/archive.py |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/daklib/archive.py b/daklib/archive.py
index ca58da8..806ba40 100644
--- a/daklib/archive.py
+++ b/daklib/archive.py
@@ -652,7 +652,13 @@ class ArchiveUpload(object):
                     continue
                 fs.copy(src, dst, mode=0o640)
 
-            source = self.changes.source
+            source = None
+            try:
+                source = self.changes.source
+            except Exception:
+                # Do not raise an exception here if the .dsc is invalid.
+                pass
+
             if source is not None:
                 for f in source.files.itervalues():
                     src = os.path.join(self.original_directory, f.filename)
-- 
1.7.2.5


Reply to: