From 2861bd9a2687dbd744997fddcfe90475be525bf0 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Mon, 7 Sep 2015 11:39:52 +0200
Subject: Ensure that no by-hash file for "Release/InRelease is written"

Git-Dch: ignore
Brown-paperbag: yes
Thanks: Donkult
---
 ftparchive/writer.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ftparchive')

diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 82049836a..eff68f07e 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -1085,8 +1085,10 @@ bool ReleaseWriter::DoPackage(string FileName)
       {
          if (!h->usable())
             continue;
-         std::string ByHashOutputFile = GenByHashFilename(Input, *h);
+         if (flNotDir(FileName) == "Release" || flNotDir(FileName) == "InRelease")
+            continue;
 
+         std::string ByHashOutputFile = GenByHashFilename(Input, *h);
          std::string ByHashOutputDir = flNotFile(ByHashOutputFile);
          if(!CreateDirectory(flNotFile(Input), ByHashOutputDir))
             return _error->Warning("can not create dir %s", flNotFile(ByHashOutputFile).c_str());
-- 
cgit v1.2.3