X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Ffind_null_maintainers.py;h=652edfd2e3ef9c403b1ab812aed04bb522d631b5;hb=564395db9f6a393a894fa1b2f7ff5aefcfadd2b7;hp=82eed1961760d3d8642cf2b00433fe1aa30647f7;hpb=30413cf0ff7bc21b8d2b8b4346406357fe55dc19;p=dak.git

diff --git a/dak/find_null_maintainers.py b/dak/find_null_maintainers.py
index 82eed196..652edfd2 100755
--- a/dak/find_null_maintainers.py
+++ b/dak/find_null_maintainers.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 
 # Check for users with no packages in the archive
-# Copyright (C) 2003  James Troup <james@nocrew.org>
-# $Id: rosamund,v 1.1 2003-09-07 13:48:51 troup Exp $
+# Copyright (C) 2003, 2006  James Troup <james@nocrew.org>
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,7 +21,7 @@
 
 import ldap, pg, sys, time
 import apt_pkg
-import utils
+from daklib import utils
 
 ################################################################################
 
@@ -32,7 +31,7 @@ projectB = None
 ################################################################################
 
 def usage(exit_code=0):
-    print """Usage: rosamund
+    print """Usage: dak find-null-maintainers
 Checks for users with no packages in the archive
 
   -h, --help                show this help and exit."""
@@ -52,28 +51,28 @@ def main():
     global Cnf, projectB
 
     Cnf = utils.get_conf()
-    Arguments = [('h',"help","Rosamund::Options::Help")]
+    Arguments = [('h',"help","Find-Null-Maintainers::Options::Help")]
     for i in [ "help" ]:
-	if not Cnf.has_key("Rosamund::Options::%s" % (i)):
-	    Cnf["Rosamund::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("Rosamund::Options")
+    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"]))
 
     before = time.time()
     sys.stderr.write("[Getting info from the LDAP server...")
-    LDAPDn = Cnf["Emilie::LDAPDn"]
-    LDAPServer = Cnf["Emilie::LDAPServer"]
+    LDAPDn = Cnf["Import-LDAP-Fingerprints::LDAPDn"]
+    LDAPServer = Cnf["Import-LDAP-Fingerprints::LDAPServer"]
     l = ldap.open(LDAPServer)
     l.simple_bind_s("","")
     Attrs = l.search_s(LDAPDn, ldap.SCOPE_ONELEVEL,
-                       "(&(keyfingerprint=*)(gidnumber=%s))" % (Cnf["Julia::ValidGID"]),
-                       ["uid", "cn", "mn", "sn", "createtimestamp"])
+                       "(&(keyfingerprint=*)(gidnumber=%s))" % (Cnf["Import-Users-From-Passwd::ValidGID"]),
+                       ["uid", "cn", "mn", "sn", "createTimestamp"])
     sys.stderr.write("done. (%d seconds)]\n" % (int(time.time()-before)))
 
 
@@ -106,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: