X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fimport_users_from_passwd.py;fp=dak%2Fimport_users_from_passwd.py;h=b959e37fa64e9f4b2020d7d6afe2226193b844ec;hb=26be481e34f6502bfaac1fbed2a00a2ed5a82350;hp=958486710251b99e5ac5e2ebf5a6cf75efef37b2;hpb=622c488469a1a5cf62a980e8d6f6ed3c0896f5a4;p=dak.git diff --git a/dak/import_users_from_passwd.py b/dak/import_users_from_passwd.py index 95848671..b959e37f 100755 --- a/dak/import_users_from_passwd.py +++ b/dak/import_users_from_passwd.py @@ -115,7 +115,12 @@ def main (): # NB: I never figured out how to use a bind parameter for this query # XXX: Fix this as it looks like a potential SQL injection attack to me # (hence the safe_name match we do) - q = session.execute('CREATE USER "%s"' % (uname)) + try: + q = session.execute('CREATE USER "%s"' % (uname)) + session.commit() + except Exception, e: + utils.warn("Could not create user %s (%s)" % (uname, str(e))) + session.rollback() else: print "NOT CREATING USER %s. Doesn't match safety regex" % uname