# 
# patch "ChangeLog"
#  from [dced28c61307cc4be0f4f1a5049587b9582b6fa3]
#    to [edbec96d7792c0b054ab9d6146fe664266557e46]
# 
# patch "commands.cc"
#  from [575e011aa37837e8a0e8e377c285b365f6482770]
#    to [cc1e1f0bf1fc482babc29b1d1f149c31893b581b]
# 
# patch "tests/t_key_management_without_db.at"
#  from [55c63a4f48a9250f7b3750d177fbaaebe1bd7eee]
#    to [8f06a4ebf0903b0bda059a0ac1b259698767be86]
# 
========================================================================
--- ChangeLog	dced28c61307cc4be0f4f1a5049587b9582b6fa3
+++ ChangeLog	edbec96d7792c0b054ab9d6146fe664266557e46
@@ -1,5 +1,10 @@
 2005-10-07  Timothy Brownawell  <address@hidden>
 
+	* commands.cc (pubkey): don't insist on having a database
+	* tests/t_key_management_without_db.at: check it
+
+2005-10-07  Timothy Brownawell  <address@hidden>
+
 	* file_io.cc, vocab.cc, Makefile.am: fix merge
 	* botan/algolist.cpp, botan/def_alg.cpp: fix merge
 
========================================================================
--- commands.cc	575e011aa37837e8a0e8e377c285b365f6482770
+++ commands.cc	cc1e1f0bf1fc482babc29b1d1f149c31893b581b
@@ -1859,7 +1859,7 @@
   rsa_keypair_id ident(idx(args, 0)());
   bool exists(false);
   base64< rsa_pub_key > key;
-  if (app.db.public_key_exists(ident))
+  if (app.db.database_specified() && app.db.public_key_exists(ident))
     {
       app.db.get_key(ident, key);
       exists = true;
========================================================================
--- tests/t_key_management_without_db.at	55c63a4f48a9250f7b3750d177fbaaebe1bd7eee
+++ tests/t_key_management_without_db.at	8f06a4ebf0903b0bda059a0ac1b259698767be86
@@ -9,6 +9,8 @@
 
 AT_CHECK(RAW_MONOTONE --keydir=keys ls keys, [], [ignore], [ignore])
 
+AT_CHECK(RAW_MONOTONE --keydir=keys pubkey foobar, [], [ignore], [ignore])
+
 AT_CHECK(RAW_MONOTONE --keydir=keys dropkey foobar, [], [ignore], [ignore])
 
 # with an invalid database should fail