dak/process_new.py: do not try to free the unchecked lockfile in no-action mode

diff --git a/ChangeLog b/ChangeLog
index ffd4fed0bf13c005f55206536599d3924a8ab305..118a057032f09accf5bb2bff05c1dcc1d8e6833c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-26  Philipp Kern  <pkern@debian.org>
+
+       * dak/process_new.py (do_accept): do not try to free the unchecked
+       lockfile in no-action mode
+
 2008-08-16  Joerg Jaspert  <joerg@debian.org>
 
        * config/debian/cron.dinstall: We dont want i18n to ever fail

diff --git a/dak/process_new.py b/dak/process_new.py
index 9ed65cc568cf90d5bdb34e39251f1f0ae4e8b307..b40ca6eccca7672cd212777b641deb48f638e63d 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -890,7 +890,8 @@ def do_accept():
             Upload.accept(summary, short_summary)
             os.unlink(Upload.pkg.changes_file[:-8]+".dak")
     finally:
-        os.unlink(Cnf["Process-New::AcceptedLockFile"])
+        if not Options["No-Action"]:
+            os.unlink(Cnf["Process-New::AcceptedLockFile"])
 
 def check_status(files):
     new = byhand = 0