gpgv: Unlink the correct temp file in error case

Previously, when data could be created and sig not, we would unlink
sig, not data (and vice versa).

diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc
index 1873f41f217aa2146b0582b5c709d0563fa9f027..15e3094488e801e555f19b0d8f1be4ed3a0f7736 100644 (file)
--- a/apt-pkg/contrib/gpgv.cc
+++ b/apt-pkg/contrib/gpgv.cc
@@ -118,9 +118,9 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
       if (sigFd == -1 || dataFd == -1)
       {
         if (dataFd != -1)
-           unlink(sig);
-        if (sigFd != -1)
            unlink(data);
+        if (sigFd != -1)
+           unlink(sig);
         ioprintf(std::cerr, "Couldn't create tempfiles for splitting up %s", File.c_str());
         exit(EINTERNAL);
       }
@@ -134,9 +134,9 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
            SplitClearSignedFile(File, &message, &dataHeader, &signature) == false)
       {
         if (dataFd != -1)
-           unlink(sig);
-        if (sigFd != -1)
            unlink(data);
+        if (sigFd != -1)
+           unlink(sig);
         ioprintf(std::cerr, "Splitting up %s into data and signature failed", File.c_str());
         exit(112);
       }