From ad6a694bcc15205e0084cc538d0a33852eca89d6 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 24 Feb 2010 09:42:11 +0200
Subject: [PATCH] Permit simple strings to be returned argv-style from headers
 too

---
 lib/header.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/header.c b/lib/header.c
index 2cd5dd3..1aa451b 100644
--- a/lib/header.c
+++ b/lib/header.c
@@ -1142,7 +1142,8 @@ static int copyTdEntry(const indexEntry entry, rpmtd td, headerGetFlags flags)
 	}
 	break;
     case RPM_STRING_TYPE:
-	if (count == 1) {
+	/* simple string, but fallthrough if its actually an array */
+	if (count == 1 && !argvArray) {
 	    td->data = allocMem ? xstrdup(entry->data) : entry->data;
 	    break;
 	}
-- 
2.7.4