From: Luca Falavigna <dktrkranz@debian.org>
Date: Mon, 13 Aug 2012 19:33:13 +0000 (+0000)
Subject: end() is not defined in daklib/queue.py
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b9c06dc38cfbd46159c90d98dc003498064dcbcd;p=dak.git

end() is not defined in daklib/queue.py

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>
---

diff --git a/dak/process_new.py b/dak/process_new.py
index b3a4a3b6..75cb975c 100755
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -532,11 +532,15 @@ def do_new(upload, upload_copy, handler, session):
                 handler.reject(reason)
                 done = True
         elif answer == 'N':
-            edit_note(get_new_comments(upload.changes.source, session=session),
-                      upload, session, bool(Options["Trainee"]))
+            if edit_note(get_new_comments(upload.changes.source, session=session),
+                         upload, session, bool(Options["Trainee"])) == 0:
+                end()
+                sys.exit(0)
         elif answer == 'P' and not Options["Trainee"]:
-            prod_maintainer(get_new_comments(upload.changes.source, session=session),
-                            upload)
+            if prod_maintainer(get_new_comments(upload.changes.source, session=session),
+                               upload) == 0:
+                end()
+                sys.exit(0)
             Logger.log(["NEW PROD", upload.changes.changesname])
         elif answer == 'R' and not Options["Trainee"]:
             confirm = utils.our_raw_input("Really clear note (y/N)? ").lower()
diff --git a/daklib/queue.py b/daklib/queue.py
index 6f01ba6c..e81614c3 100644
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -132,8 +132,7 @@ def prod_maintainer(notes, upload):
     if answer == 'A':
         return
     elif answer == 'Q':
-        end()
-        sys.exit(0)
+        return 0
     # Otherwise, do the proding...
     user_email_address = utils.whoami() + " <%s>" % (
         cnf["Dinstall::MyAdminAddress"])
@@ -186,8 +185,7 @@ def edit_note(note, upload, session, trainee=False):
     if answer == 'A':
         return
     elif answer == 'Q':
-        end()
-        sys.exit(0)
+        return 0
 
     comment = NewComment()
     comment.package = upload.changes.source