X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=dak%2Fprocess_upload.py;h=4d9f3b00b768071363bd9ac74c72cefe19de7e74;hp=bf74baa65be064e356abaa8459b39a6688c85ad9;hb=27e00376e81d1c37ff327ee0d39670b266418869;hpb=e956742235d6272e38424dc0c89b883153e776b7

diff --git a/dak/process_upload.py b/dak/process_upload.py
index bf74baa6..4d9f3b00 100755
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -229,7 +229,7 @@ def action(u, session):
 
     try:
         chg = session.query(DBChange).filter_by(changesname=os.path.basename(u.pkg.changes_file)).one()
-    except NoResultFound, e:
+    except NoResultFound as e:
         chg = None
 
     if len(u.rejects) > 0:
@@ -458,7 +458,7 @@ def main():
         lock_fd = os.open(os.path.join(cnf["Dir::Lock"], 'dinstall.lock'), os.O_RDWR | os.O_CREAT)
         try:
             fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
-        except IOError, e:
+        except IOError as e:
             if errno.errorcode[e.errno] == 'EACCES' or errno.errorcode[e.errno] == 'EAGAIN':
                 utils.fubar("Couldn't obtain lock; assuming another 'dak process-upload' is already running.")
             else: