View | Details | Raw Unified | Return to bug 49445
Collapse All | Expand All

(-)a/services/univention-s4-connector/scripts/remove_s4_rejected.py (-2 / +2 lines)
 Lines 43-53   class ObjectNotFound(BaseException): Link Here 
43
def remove_s4_rejected(s4_dn):
43
def remove_s4_rejected(s4_dn):
44
	cache_db = sqlite3.connect('/etc/univention/connector/s4internal.sqlite')
44
	cache_db = sqlite3.connect('/etc/univention/connector/s4internal.sqlite')
45
	c = cache_db.cursor()
45
	c = cache_db.cursor()
46
	c.execute("SELECT key FROM 'S4 rejected' WHERE value='%s'" % s4_dn)
46
	c.execute("SELECT key FROM 'S4 rejected' WHERE value=?", [unicode(s4_dn)])
47
	key = c.fetchone()
47
	key = c.fetchone()
48
	if not key:
48
	if not key:
49
		raise ObjectNotFound
49
		raise ObjectNotFound
50
	c.execute("DELETE FROM 'S4 rejected' WHERE value='%s'" % s4_dn)
50
	c.execute("DELETE FROM 'S4 rejected' WHERE value=?", [unicode(s4_dn)])
51
	cache_db.commit()
51
	cache_db.commit()
52
	cache_db.close()
52
	cache_db.close()
53
53
(-)a/services/univention-s4-connector/scripts/remove_ucs_rejected.py (-2 / +2 lines)
 Lines 44-50   class ObjectNotFound(BaseException): Link Here 
44
def remove_ucs_rejected(ucs_dn):
44
def remove_ucs_rejected(ucs_dn):
45
	cache_db = sqlite3.connect('/etc/univention/connector/s4internal.sqlite')
45
	cache_db = sqlite3.connect('/etc/univention/connector/s4internal.sqlite')
46
	c = cache_db.cursor()
46
	c = cache_db.cursor()
47
	c.execute("SELECT key FROM 'UCS rejected' WHERE value='%s'" % ucs_dn)
47
	c.execute("SELECT key FROM 'UCS rejected' WHERE value=?" % [unicode(ucs_dn)])
48
	filenames = c.fetchall()
48
	filenames = c.fetchall()
49
	if not filenames:
49
	if not filenames:
50
		raise ObjectNotFound
50
		raise ObjectNotFound
 Lines 52-58   def remove_ucs_rejected(ucs_dn): Link Here 
52
		if filename:
52
		if filename:
53
			if os.path.exists(filename[0]):
53
			if os.path.exists(filename[0]):
54
				os.remove(filename[0])
54
				os.remove(filename[0])
55
	c.execute("DELETE FROM 'UCS rejected' WHERE value='%s'" % ucs_dn)
55
	c.execute("DELETE FROM 'UCS rejected' WHERE value=?" % [unicode(ucs_dn)])
56
	cache_db.commit()
56
	cache_db.commit()
57
	cache_db.close()
57
	cache_db.close()
58
58

Return to bug 49445