#
#
# patch "cmd_list.cc"
#  from [402b02ba60303be6eba9504f1e20998079b83a2e]
#    to [24c43dd8c6b74277b6787ce6d648248c382fe788]
# 
# patch "project.cc"
#  from [5b12a35283e894b9db1b6549cf2afac4f1cb6097]
#    to [ead04f0d92d9364504b2a8cb93801c8a17a5984a]
# 
# patch "tests/automate_cert/expected"
#  from [52a89ade4df34887ebdff7c974e989916d601056]
#    to [30ad0a342394bd7533dc8534b3cfd401f17ea8fc]
# 
# patch "tests/automate_certs/expected"
#  from [ad6e7cffbd27a4cb1e19cf9f178f77692df4163a]
#    to [b7879a7a482ebc4838bf26569e51f9b135d713a1]
#
============================================================
--- cmd_list.cc	402b02ba60303be6eba9504f1e20998079b83a2e
+++ cmd_list.cc	24c43dd8c6b74277b6787ce6d648248c382fe788
@@ -764,7 +764,7 @@ CMD_AUTOMATE(keys, "",
       stz.push_str_pair(syms::name, i->second.get<0>());
       stz.push_str_pair(syms::name, i->second.get<1>());/* FIXME */
       stz.push_str_multi(syms::public_location, i->second.get<2>());
-      if (!i->second.get<2>().empty())
+      if (!i->second.get<3>().empty())
         stz.push_str_multi(syms::private_location, i->second.get<3>());
       prt.print_stanza(stz);
     }
@@ -862,7 +862,9 @@ CMD_AUTOMATE(certs, N_("REV"),
         app.lua.hook_get_revision_cert_trust(signers, rid.inner(),
                                              name, tv);
 
-      st.push_str_pair(syms::key, keyid.inner()());
+      hexenc<id> keyid_enc;
+      encode_hexenc(keyid.inner(), keyid_enc);
+      st.push_hex_pair(syms::key, keyid_enc);
 
       string stat;
       switch (status)
============================================================
--- project.cc	5b12a35283e894b9db1b6549cf2afac4f1cb6097
+++ project.cc	ead04f0d92d9364504b2a8cb93801c8a17a5984a
@@ -447,28 +447,32 @@ project_t::lookup_key_by_name(key_store 
       // or lookup in the policy branches (once those are implemented)
 
       set<key_id> found;
-      vector<key_id> dbkeys;
-      db.get_key_ids(dbkeys);
-      for (vector<key_id>::const_iterator i = dbkeys.begin();
-           i != dbkeys.end(); ++i)
+
+      vector<key_id> storekeys;
+      keys.get_key_ids(storekeys);
+      for (vector<key_id>::const_iterator i = storekeys.begin();
+           i != storekeys.end(); ++i)
         {
           key_name i_name;
-          rsa_pub_key pub;
-          db.get_pubkey(*i, i_name, pub);
+          keypair kp;
+          keys.get_key_pair(*i, i_name, kp);
           if (i_name == name)
             {
               found.insert(*i);
             }
         }
 
-      vector<key_id> storekeys;
-      keys.get_key_ids(storekeys);
-      for (vector<key_id>::const_iterator i = storekeys.begin();
-           i != storekeys.end(); ++i)
+      vector<key_id> dbkeys;
+      if (db.database_specified())
         {
+          db.get_key_ids(dbkeys);
+        }
+      for (vector<key_id>::const_iterator i = dbkeys.begin();
+           i != dbkeys.end(); ++i)
+        {
           key_name i_name;
-          keypair kp;
-          keys.get_key_pair(*i, i_name, kp);
+          rsa_pub_key pub;
+          db.get_pubkey(*i, i_name, pub);
           if (i_name == name)
             {
               found.insert(*i);
@@ -497,15 +501,15 @@ project_t::get_canonical_name_of_key(key
                                      key_id const & id,
                                      key_name & name)
 {
-  if (db.public_key_exists(id))
+  if (keys.key_pair_exists(id))
     {
-      rsa_pub_key pub;
-      db.get_pubkey(id, name, pub);
+      keypair kp;
+      keys.get_key_pair(id, name, kp);
     }
-  else if (keys.key_pair_exists(id))
+  else if (db.public_key_exists(id))
     {
-      keypair kp;
-      keys.get_key_pair(id, name, kp);
+      rsa_pub_key pub;
+      db.get_pubkey(id, name, pub);
     }
   else
     {
============================================================
--- tests/automate_cert/expected	52a89ade4df34887ebdff7c974e989916d601056
+++ tests/automate_cert/expected	30ad0a342394bd7533dc8534b3cfd401f17ea8fc
@@ -1,29 +1,29 @@
-      key "address@hidden"
+      key [46ec58576f9e4f34a9eede521422aa5fd299dc50]
 signature "ok"
      name "author"
     value "address@hidden"
     trust "trusted"
 
-      key "address@hidden"
+      key [46ec58576f9e4f34a9eede521422aa5fd299dc50]
 signature "ok"
      name "branch"
     value "testbranch"
     trust "trusted"
 
-      key "address@hidden"
+      key [46ec58576f9e4f34a9eede521422aa5fd299dc50]
 signature "ok"
      name "changelog"
     value "blah-blah
 "
     trust "trusted"
 
-      key "address@hidden"
+      key [46ec58576f9e4f34a9eede521422aa5fd299dc50]
 signature "ok"
      name "date"
     value "2005-05-21T12:30:51"
     trust "trusted"
 
-      key "address@hidden"
+      key [46ec58576f9e4f34a9eede521422aa5fd299dc50]
 signature "ok"
      name "testcert"
     value "testvalue"
============================================================
--- tests/automate_certs/expected	ad6e7cffbd27a4cb1e19cf9f178f77692df4163a
+++ tests/automate_certs/expected	b7879a7a482ebc4838bf26569e51f9b135d713a1
@@ -1,23 +1,23 @@
-      key "address@hidden"
+      key [46ec58576f9e4f34a9eede521422aa5fd299dc50]
 signature "ok"
      name "author"
     value "address@hidden"
     trust "trusted"
 
-      key "address@hidden"
+      key [46ec58576f9e4f34a9eede521422aa5fd299dc50]
 signature "ok"
      name "branch"
     value "testbranch"
     trust "trusted"
 
-      key "address@hidden"
+      key [46ec58576f9e4f34a9eede521422aa5fd299dc50]
 signature "ok"
      name "changelog"
     value "blah-blah
 "
     trust "trusted"
 
-      key "address@hidden"
+      key [46ec58576f9e4f34a9eede521422aa5fd299dc50]
 signature "ok"
      name "date"
     value "2005-05-21T12:30:51"