#
#
# patch "NEWS"
#  from [f9ad73fdb03689b042b8512e7f31e045dddfdb04]
#    to [7efaa0e15d63b4dd2e2739ec49f6125a9ba82d2e]
# 
# patch "project.cc"
#  from [da20b004d233b9bdace2efa9bcaaa9e861bd3e87]
#    to [c21ea828b047a8ca2cf7b3c329bdd806d0fda958]
#
============================================================
--- NEWS	f9ad73fdb03689b042b8512e7f31e045dddfdb04
+++ NEWS	7efaa0e15d63b4dd2e2739ec49f6125a9ba82d2e
@@ -125,6 +125,10 @@ Xxx Xxx 99 99:99:99 UTC 2010
           when dealing with restricted file sets
           (fixes monotone bug #30291)
 
+        - monotone no longer throws an unrecoverable error if a public or 
+          private key is addressed with some non-existing key id
+          (fixes monotone bug #30462)
+
         - A regression in 0.48 made a path-restricted `mtn log' show
           revisions, in which not the picked path(s), but one of its parents
           were changed.  This has been fixed.
============================================================
--- project.cc	da20b004d233b9bdace2efa9bcaaa9e861bd3e87
+++ project.cc	c21ea828b047a8ca2cf7b3c329bdd806d0fda958
@@ -582,7 +582,7 @@ project_t::get_given_name_of_key(key_sto
     }
   else
     {
-      E(false, origin::internal,
+      E(false, id.inner().made_from,
         F("key %s does not exist") % id);
     }
 }
@@ -663,7 +663,7 @@ describe_revision(options const & opts, 
 
 string
 describe_revision(options const & opts, lua_hooks & lua,
-		  project_t & project, revision_id const & id)
+                  project_t & project, revision_id const & id)
 {
   cert_name author_name(author_cert_name);
   cert_name date_name(date_cert_name);