merge ftpmaster branch

[dak.git] / dak / find_null_maintainers.py

diff --git a/dak/find_null_maintainers.py b/dak/find_null_maintainers.py
old mode 100755 (executable)
new mode 100644 (file)
index de5e029..727ed31
--- a/dak/find_null_maintainers.py
+++ b/dak/find_null_maintainers.py
@@ -21,7 +21,7 @@
 
 import ldap, pg, sys, time
 import apt_pkg
-import dak.lib.utils as utils
+import daklib.utils
 
 ################################################################################
 
@@ -50,17 +50,17 @@ def get_ldap_value(entry, value):
 def main():
     global Cnf, projectB
 
-    Cnf = utils.get_conf()
+    Cnf = daklib.utils.get_conf()
     Arguments = [('h',"help","Find-Null-Maintainers::Options::Help")]
     for i in [ "help" ]:
-       if not Cnf.has_key("Find-Null-Maintainers::Options::%s" % (i)):
-           Cnf["Find-Null-Maintainers::Options::%s" % (i)] = ""
+        if not Cnf.has_key("Find-Null-Maintainers::Options::%s" % (i)):
+            Cnf["Find-Null-Maintainers::Options::%s" % (i)] = ""
 
     apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv)
 
     Options = Cnf.SubTree("Find-Null-Maintainers::Options")
     if Options["Help"]:
-       usage()
+        usage()
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
 
@@ -72,7 +72,7 @@ def main():
     l.simple_bind_s("","")
     Attrs = l.search_s(LDAPDn, ldap.SCOPE_ONELEVEL,
                        "(&(keyfingerprint=*)(gidnumber=%s))" % (Cnf["Import-Users-From-Passwd::ValidGID"]),
-                       ["uid", "cn", "mn", "sn", "createtimestamp"])
+                       ["uid", "cn", "mn", "sn", "createTimestamp"])
     sys.stderr.write("done. (%d seconds)]\n" % (int(time.time()-before)))
 
 
@@ -105,7 +105,7 @@ SELECT DISTINCT u.uid FROM suite su, bin_associations ba, binaries b, fingerprin
     for i in Attrs:
         entry = i[1]
         uid = entry["uid"][0]
-        created = time.mktime(time.strptime(entry["createtimestamp"][0][:8], '%Y%m%d'))
+        created = time.mktime(time.strptime(entry["createTimestamp"][0][:8], '%Y%m%d'))
         diff = now - created
         # 31536000 is 1 year in seconds, i.e. 60 * 60 * 24 * 365
         if diff < 31536000 / 2: