From b916363b40b17788c899e1781d4d0d427cd99e4e Mon Sep 17 00:00:00 2001
From: Jeremy Lakeman <Jeremy.Lakeman@gmail.com>
Date: Wed, 28 Aug 2013 16:15:28 +0930
Subject: [PATCH] Treat empty filehash the same as NULL

---
 rhizome.c          | 2 +-
 rhizome_database.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rhizome.c b/rhizome.c
index a5dd419d..e2a0b498 100644
--- a/rhizome.c
+++ b/rhizome.c
@@ -281,7 +281,7 @@ int rhizome_add_manifest(rhizome_manifest *m_in,int ttl)
       if (m_in->version < storedversion)
 	return WHY("Newer version exists");
       if (m_in->version == storedversion)
-	return WHY("Same version of manifest exists, not adding");
+	return WHYF("Already have %s:%"PRId64", not adding", id, m_in->version);
       break;
     default:
       return WHY("Select found too many rows!");
diff --git a/rhizome_database.c b/rhizome_database.c
index e6f0c335..77513c89 100644
--- a/rhizome_database.c
+++ b/rhizome_database.c
@@ -1520,9 +1520,9 @@ static int is_interesting(const char *id_hex, int64_t version)
   if (sqlite_step_retry(&retry, statement) == SQLITE_ROW){
     const char *q_filehash = (const char *) sqlite3_column_text(statement, 0);
     ret=0;
-    if (q_filehash && !rhizome_exists(q_filehash))
+    if (q_filehash && *q_filehash && !rhizome_exists(q_filehash))
       ret=1;
-  }  
+  }
   sqlite3_finalize(statement);
 
   RETURN(ret);