Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-download-file

Conflicts:
	cmdline/apt-helper.cc
	test/integration/framework
	test/integration/test-apt-https-no-redirect

1 files changed, 2 insertions, 1 deletions

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index 4a24b01d9..e3652d1ee 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -56,13 +56,14 @@ bool DoDownloadFile(CommandLine &CmdL)
       return false;
    }
    if(hash.empty() == false)
+   {
       if(hash.VerifyFile(targetfile) == false)
       {
          _error->Error(_("HashSum Failed"));
          Rename(targetfile, targetfile+".failed");
          return false;
       }
-
+   }
    return true;
 }