On Thursday 04 September 2008 11:34:34 am Michael Schwendt wrote:
On Thu, 4 Sep 2008 10:29:19 -0500, Dennis Gilmore wrote:
> On Thursday 04 September 2008 10:04:38 am Michael Schwendt wrote:
> > On Thu, 4 Sep 2008 09:56:47 -0500, Dennis Gilmore wrote:
> > > I tested on rawhide and it worked fine.
> > >
> > > [root@files ~]# plague-user-manager testdb add dennis@localhost
> > > User dennis@localhost added.
> >
> > The test-case is wrong and incomplete. Use "userdb", add a user who
> > can build, then submit a build-job. Also show that
> > plague-user-manager's find command works.
>
> userdb is obsolete users and jobs are in the one database file.
$ grep userdb /usr/share/plague/server/User.py
def get_userdb_dbcx():
dbcx = sqlite.connect(CONFIG_LOCATION + "userdb", timeout=4)
(dbcx, curs) = get_userdb_dbcx()
(dbcx, curs) = get_userdb_dbcx()
in my test instances the users are tracked in the jobdb i dont have a userdb
> I think that your issue is that you have an old setup with the
two
> seperate dbs.
My issue is that between 0.4.5 and 0.4.5.1 you applied my sqlite3 patch,
which doesn't work with sqlite2, but you made Plague use sqlite2. There
are incompatibilites in what is returned by fetchall/fetchone in the
different APIs.
that is the one patch I did not apply. I took parts of it and
refactored it.
python-sqlite2 is largely the same API as python-sqlite since they come from
the same place. however python-sqlite2 is linked against sqlite3 there is no
sqlite2 in fedora any longer. I wanted the same code to work on EL and Fedora
and yes fetchall fetchone operates differently
rpm -q --requires python-sqlite2
libc.so.6()(64bit)
libc.so.6(GLIBC_2.2.5)(64bit)
libc.so.6(GLIBC_2.3)(64bit)
libc.so.6(GLIBC_2.4)(64bit)
libpthread.so.0()(64bit)
libpython2.5.so.1.0()(64bit)
libsqlite3.so.0()(64bit)
python(abi) = 2.5
rpmlib(CompressedFileNames) <= 3.0.4-1
rpmlib(PayloadFilesHavePrefix) <= 4.0-1
rtld(GNU_HASH)
sqlite >= 3.3.3
diff -u -r1.3.8.1 user-manager.py
--- utils/user-manager.py 4 Sep 2008 02:14:21 -0000 1.3.8.1
+++ utils/user-manager.py 4 Sep 2008 16:59:18 -0000
@@ -22,6 +22,8 @@
import sqlite
except ImportError, e:
import pysqlite2._sqlite as sqlite
+sys.path.append('/usr/share/plague/server')
+from DBManager import ResultSet
def print_usage(prog):
print "Usage:\n"
@@ -178,7 +180,7 @@
self.curs.execute(sql)
self.dbcx.commit()
- data = self.curs.fetchall()
+ data = [ResultSet(row,self.curs.description) for row in
self.curs.fetchall()]
if not len(data):
raise UserManagerException("No matching users found.")
that should fix your issue with find and it works on RHEL 5
Dennis