[dak/master] daklib/archive.py: give a nicer error message for already known .changes
Bug-Debian: http://bugs.debian.org/693163
---
daklib/archive.py | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/daklib/archive.py b/daklib/archive.py
index 26acaf6..6a424cd 100644
--- a/daklib/archive.py
+++ b/daklib/archive.py
@@ -33,6 +33,7 @@ import os
import shutil
import subprocess
from sqlalchemy.orm.exc import NoResultFound
+import sqlalchemy.exc
import tempfile
import traceback
@@ -1004,8 +1005,11 @@ class ArchiveUpload(object):
db_changes.changelog_id = changelog_id
db_changes.closes = self.changes.closed_bugs
- self.transaction.session.add(db_changes)
- self.transaction.session.flush()
+ try:
+ self.transaction.session.add(db_changes)
+ self.transaction.session.flush()
+ except sqlalchemy.exc.IntegrityError:
+ raise ArchiveException('{0} is already known.'.format(self.changes.filename))
return db_changes
--
1.7.2.5
Reply to: