[dak/master] drop unused function, fix a docstring
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
dak/process_new.py | 16 +---------------
daklib/queue.py | 15 ++-------------
2 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/dak/process_new.py b/dak/process_new.py
index 5a88ffc..b8550fd 100755
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -769,21 +769,7 @@ def do_pkg(changes_file, session):
except CantGetLockError:
print "Hello? Operator! Give me the number for 911!"
print "Dinstall in the locked area, cant process packages, come back later"
-# (new, byhand) = check_status(files)
-# if new or byhand:
-# if new:
-# do_new(u, session)
-# if byhand:
-# do_byhand(u, session)
-# (new, byhand) = check_status(files)
-
-# if not new and not byhand:
-# try:
-# check_daily_lock()
-# do_accept(u)
-# except CantGetLockError:
-# print "Hello? Operator! Give me the number for 911!"
-# print "Dinstall in the locked area, cant process packages, come back later"
+
except AlreadyLockedError, e:
print "Seems to be locked by %s already, skipping..." % (e)
diff --git a/daklib/queue.py b/daklib/queue.py
index dd654cd..907e98c 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -231,17 +231,6 @@ def check_valid(new):
###############################################################################
-def check_status(files):
- new = byhand = 0
- for f in files.keys():
- if files[f].has_key("byhand"):
- byhand = 1
- elif files[f].has_key("new"):
- new = 1
- return (new, byhand)
-
-###############################################################################
-
# Used by Upload.check_timestamps
class TarTime(object):
def __init__(self, future_cutoff, past_cutoff):
@@ -364,8 +353,8 @@ class Upload(object):
Load a changes file and setup a dictionary around it. Also checks for mandantory
fields within.
- @type: string
- @param: Changes filename, full path.
+ @type filename: string
+ @param filename: Changes filename, full path.
@rtype: boolean
@return: whether the changes file was valid or not. We may want to
--
1.6.5
Reply to: