extras-buildsys/utils Makefile, 1.5, 1.5.8.1 user-manager.py, 1.3, 1.3.8.1

[Dennis Gilmore]

Author: ausil

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4025/utils

Modified Files:
      Tag: Plague-0_4_5
	Makefile user-manager.py 
Log Message:
- update to 0.4.5.1  applying Michael schwendt's logging and mock patches
- using pysqlite2 on fedora and python-sqlite on RHEL
- requires mock > 0.8
- requires createrepo >= 0.4.7




Index: Makefile
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/Makefile,v
retrieving revision 1.5
retrieving revision 1.5.8.1
diff -u -r1.5 -r1.5.8.1
--- Makefile	8 Aug 2005 19:11:25 -0000	1.5
+++ Makefile	4 Sep 2008 02:14:21 -0000	1.5.8.1
@@ -11,5 +11,5 @@
 
 install:
 	$(MKDIR) -p $(DESTDIR)/$(BINDIR)
-	$(INSTALL) -m 755 user-manager.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-user-manager.py
-	$(INSTALL) -m 755 certhelper.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-certhelper.py
+	$(INSTALL) -m 755 user-manager.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-user-manager
+	$(INSTALL) -m 755 certhelper.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-certhelper


Index: user-manager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/user-manager.py,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -u -r1.3 -r1.3.8.1
--- user-manager.py	8 Aug 2005 16:15:18 -0000	1.3
+++ user-manager.py	4 Sep 2008 02:14:21 -0000	1.3.8.1
@@ -18,8 +18,10 @@
 
 
 import sys, os
-import sqlite
-
+try:
+    import sqlite
+except ImportError, e:
+    import pysqlite2._sqlite as sqlite
 
 def print_usage(prog):
     print "Usage:\n"
@@ -38,7 +40,7 @@
 
 class UserManager:
     def __init__(self, dbfile):
-        self.dbcx = sqlite.connect(dbfile, encoding="utf-8", timeout=2)
+        self.dbcx = sqlite.connect(dbfile, timeout=2)
         self.curs = self.dbcx.cursor()
 
         # Ensure the table exists in the database
@@ -46,7 +48,7 @@
         try:
             self.curs.execute('SELECT * FROM users')
             self.dbcx.commit()
-        except sqlite._sqlite.DatabaseError, e:
+        except sqlite.DatabaseError, e:
             create = True
 
         if create: