]> err.no Git - dak/commit
projects / dak / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 83fa0f1 aa47bd2)
Merge commit 'lamby/master' into merge
authorJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 14:49:24 +0000 (15:49 +0100)
committerJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 14:49:24 +0000 (15:49 +0100)
commit895d11faa1fc13583c302961450679c6b589960f
tree087157c2a51c51011802ebd7f7fd6b14c2dd6d95tree | snapshot
parent83fa0f11f1fc2794cb9e13d015b6dd32d50827f5commit | diff
parentaa47bd280bedc83cb1c7d55f80478d813c160931commit | diff
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 <joerg@debian.org>
Unnamed repository; edit this file 'description' to name the repository.