X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_new.py;h=52e1f4e9780350d722e533a0a179b0f290a4c577;hb=8752b2fed37bee42a2ce7046385e99ff5035c37c;hp=7d76937f760a34f57c39901cef5fd42102acac0c;hpb=0d19eda0946e4bb1fd7b2151eceed80390fb8acf;p=dak.git

diff --git a/dak/process_new.py b/dak/process_new.py
index 7d76937f..52e1f4e9 100755
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -41,6 +41,8 @@
 
 ################################################################################
 
+from __future__ import with_statement
+
 import copy
 import errno
 import os
@@ -49,6 +51,7 @@ import stat
 import sys
 import time
 import contextlib
+import pwd
 import apt_pkg, apt_inst
 import examine_package
 from daklib import database
@@ -700,7 +703,7 @@ def do_new():
             edit_note(database.get_new_comments(changes.get("source", "")))
         elif answer == 'P' and not Options["Trainee"]:
             prod_maintainer(database.get_new_comments(changes.get("source", "")))
-        elif answer == 'R':
+        elif answer == 'R' and not Options["Trainee"]:
             confirm = utils.our_raw_input("Really clear note (y/N)? ").lower()
             if confirm == "y":
                 database.delete_new_comments(changes.get("source"), changes.get("version"))
@@ -850,7 +853,8 @@ def lock_package(package):
         fd = os.open(path, os.O_CREAT | os.O_EXCL | os.O_RDONLY)
     except OSError, e:
         if e.errno == errno.EEXIST or e.errno == errno.EACCES:
-            raise AlreadyLockedError, e.errno
+            user = pwd.getpwuid(os.stat(path)[stat.ST_UID])[4].split(',')[0].replace('.', '')
+            raise AlreadyLockedError, user
 
     try:
         yield fd
@@ -997,7 +1001,7 @@ def do_pkg(changes_file):
             if not new and not byhand:
                 do_accept()
     except AlreadyLockedError, e:
-        print "Seems to be locked already, skipping..."
+        print "Seems to be locked by %s already, skipping..." % (e)
 
 ################################################################################