[sysadmin-bin] Additional fixes to the foundation-db-operations script

[Andrea Veri <av src gnome org>]

commit f52a38d1a0047a0c3f05521297e1af706ec46e13
Author: Andrea Veri <av gnome org>
Date:   Sat May 3 21:25:56 2014 +0200

    Additional fixes to the foundation-db-operations script

 membership/foundation-db-operations.py |   62 ++++++++++++++++---------------
 1 files changed, 32 insertions(+), 30 deletions(-)
---
diff --git a/membership/foundation-db-operations.py b/membership/foundation-db-operations.py
index a831bb4..b94d0f4 100755
--- a/membership/foundation-db-operations.py
+++ b/membership/foundation-db-operations.py
@@ -49,21 +49,43 @@ parser.add_option("--automatic-subscriptions",
 
 (options, args) = parser.parse_args()
 
-file = open('/home/admin/secret/anonvoting','r')
-lines = file.readlines()
+if options.sync_resources:
+        file = open('/home/admin/secret/ldap','r')
+        lines = file.readlines()
 
-for line in lines:
-        if line.find("mysql_password") > -1:
+        for line in lines:
+            if line.find("ldap_password") > -1:
                 dirty_password = line.split()
-                anonvoting_password = str(dirty_password)
+                       ldap_password = str(dirty_password)
 
-                sanitize_file=["\'","(",")","$mysql_password","=","[","]","\"",";"]
+                sanitize_file=["ldap_password","=","\"","'","[","]"]
                 for i in range(len(sanitize_file)):
-                        anonvoting_password = anonvoting_password.replace(sanitize_file[i],"")
-file.close()
+                    ldap_password = ldap_password.replace(sanitize_file[i],"")
+                    file.close()
+
+        try:
+            l = ldap.open('ldap.gnome.org')
+            l.simple_bind("cn=Manager,dc=gnome,dc=org", ldap_password)
+        except ldap.LDAPError, e:
+            print >>sys.stderr, e
+            sys.exit(1)
 
 
 def query_database_with(query):
+    file = open('/home/admin/secret/anonvoting','r')
+    lines = file.readlines()
+
+    for line in lines:
+        if line.find("mysql_password") > -1:
+            dirty_password = line.split()
+            anonvoting_password = str(dirty_password)
+
+            sanitize_file=["\'","(",")","$mysql_password","=","[","]","\"",";"]
+             for i in range(len(sanitize_file)):
+                 anonvoting_password = anonvoting_password.replace(sanitize_file[i],"")
+    file.close()
+
+
     db = MySQLdb.connect(host="range-back",
     user = "anonvoting",
     passwd = anonvoting_password,
@@ -104,8 +126,6 @@ def emeritus_members():
     for row in emeritus_members_list:
         return row[0]
 
-now = time.time()
-
 
 def main():
     if options.print_current_members:
@@ -117,26 +137,6 @@ def main():
         print_due_expiration()
 
     if options.sync_resources:
-        file = open('/home/admin/secret/ldap','r')
-        lines = file.readlines()
-
-        for line in lines:
-            if line.find("ldap_password") > -1:
-                dirty_password = line.split()
-                ldap_password = str(dirty_password)
-
-                sanitize_file=["ldap_password","=","\"","'","[","]"]
-                for i in range(len(sanitize_file)):
-                    ldap_password = ldap_password.replace(sanitize_file[i],"")
-                    file.close()
-
-        try:
-            l = ldap.open('ldap.gnome.org')
-            l.simple_bind("cn=Manager,dc=gnome,dc=org", ldap_password)
-        except ldap.LDAPError, e:
-            print >>sys.stderr, e
-            sys.exit(1)
-
         sync_foundation_db_with_ldap()
 
     if options.remove_old_foundation_members:
@@ -168,6 +168,8 @@ def print_current_members():
 
 
 def print_due_expiration():
+    now = time.time()
+
     due_expiration = {}
     last_renewed = query_database_with('select firstname, lastname, last_renewed_on from foundationmembers 
WHERE ((curdate() - interval 2 year) <= `foundationmembers`.`last_renewed_on`);')