From: Joerg Jaspert Date: Mon, 26 Oct 2009 14:49:24 +0000 (+0100) Subject: Merge commit 'lamby/master' into merge X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=895d11faa1fc13583c302961450679c6b589960f;p=dak Merge commit 'lamby/master' into merge * commit 'lamby/master': Make import_keyring use dbconn.get_or_set_uid. Make import_keyring use get_or_set_keyring. Port database.get_or_set_keyring_id => dbconn.get_or_set_keyring Use gzip.open(.., 'rb') instead of gunzip and temporary filenames. Signed-off-by: Joerg Jaspert --- 895d11faa1fc13583c302961450679c6b589960f