From 542bf554faf60be0f5b25528a8a7e23e1bd1a40b Mon Sep 17 00:00:00 2001
From: Mirek Kratochvil <exa.exa@gmail.com>
Date: Tue, 23 Apr 2013 20:59:02 +0200
Subject: [PATCH] action: fix naming on import

---
 src/actions.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 492d537..2e981b2 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -1046,7 +1046,9 @@ int action_import (bool armor, bool no_action, bool yes, bool fp,
 		if (keyspec_matches (filter, i->second.name, i->first) ) {
 			KR.remove_pubkey (i->first);
 			KR.remove_keypair (i->first);
-			KR.store_pubkey (i->first, i->second.name,
+			KR.store_pubkey (i->first,
+			                 name.length() ?
+			                 name : i->second.name,
 			                 i->second.alg, i->second.key);
 		}
 	}
@@ -1295,7 +1297,9 @@ int action_import_sec (bool armor, bool no_action, bool yes, bool fp,
 		if (keyspec_matches (filter, i->second.pub.name, i->first) ) {
 			KR.remove_pubkey (i->first);
 			KR.remove_keypair (i->first);
-			KR.store_keypair (i->first, i->second.pub.name,
+			KR.store_keypair (i->first,
+			                  name.length() ?
+			                  name : i->second.pub.name,
 			                  i->second.pub.alg,
 			                  i->second.pub.key, i->second.privkey);
 		}