Set APT::FTPArchive::DoByHash to false by default

"apt-ftparchive release" will create the by-hash files if
this mode is enabled. This maybe unexpected by existing users
so make it a opt-in.

Git-Dch: ignore

diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index eff68f07ea12ea10f95a1dc6f9eb76b67e52f5be..11ba3a3233b1851b1e641bec41e7f1ff2984ccd8 100644 (file)
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -1020,7 +1020,7 @@ ReleaseWriter::ReleaseWriter(FileFd * const GivenOutput, string const &/*DB*/) :
    Fields["Architectures"] = "";
    Fields["Components"] = "";
    Fields["Description"] = "";
    Fields["Architectures"] = "";
    Fields["Components"] = "";
    Fields["Description"] = "";

-   if (_config->FindB("APT::FTPArchive::DoByHash", true) == true)
+   if (_config->FindB("APT::FTPArchive::DoByHash", false) == true)

       Fields["Acquire-By-Hash"] = "true";
    
    for(map<string,string>::const_iterator I = Fields.begin();
       Fields["Acquire-By-Hash"] = "true";
    
    for(map<string,string>::const_iterator I = Fields.begin();


@@ -1076,7 +1076,7 @@ bool ReleaseWriter::DoPackage(string FileName)
 
    // FIXME: wrong layer in the code(?)
    // FIXME2: symlink instead of create a copy
 
    // FIXME: wrong layer in the code(?)
    // FIXME2: symlink instead of create a copy

-   if (_config->FindB("APT::FTPArchive::DoByHash", true) == true)
+   if (_config->FindB("APT::FTPArchive::DoByHash", false) == true)

    {
       std::string Input = FileName;
       HashStringList hsl = hs.GetHashStringList();
    {
       std::string Input = FileName;
       HashStringList hsl = hs.GetHashStringList();


@@ -1141,7 +1141,7 @@ void ReleaseWriter::Finish()
 
    // go by-hash cleanup
    map<string,ReleaseWriter::CheckSum>::const_iterator prev = CheckSums.begin();
 
    // go by-hash cleanup
    map<string,ReleaseWriter::CheckSum>::const_iterator prev = CheckSums.begin();

-   if (_config->FindB("APT::FTPArchive::DoByHash", true) == true)
+   if (_config->FindB("APT::FTPArchive::DoByHash", false) == true)

    {
       for(map<string,ReleaseWriter::CheckSum>::const_iterator I = CheckSums.begin();
         I != CheckSums.end(); ++I)
    {
       for(map<string,ReleaseWriter::CheckSum>::const_iterator I = CheckSums.begin();
         I != CheckSums.end(); ++I)

diff --git a/test/integration/test-apt-ftparchive-by-hash b/test/integration/test-apt-ftparchive-by-hash
index 6cda0e41515e339a07cec6edf58a2e589b4a1071..f00e2a24c23fd0b0d606e9b45d38ccb64b810c30 100755 (executable)
--- a/test/integration/test-apt-ftparchive-by-hash
+++ b/test/integration/test-apt-ftparchive-by-hash
@@ -19,6 +19,9 @@ setupenvironment
 configarchitecture 'i386'
 configcompression 'gz' '.'
 
 configarchitecture 'i386'
 configcompression 'gz' '.'
 

+# enable by-hash in apt-ftparchive
+echo 'APT::FTPArchive::DoByHash "1";' >> aptconfig.conf
+

 # build one pacakge
 buildsimplenativepackage 'foo' 'i386' '1' 'unstable'
 buildaptarchivefromincoming
 # build one pacakge
 buildsimplenativepackage 'foo' 'i386' '1' 'unstable'
 buildaptarchivefromincoming