Browse Source

tracing bugs

Kevin Bradley 11 months ago
parent
commit
01b4d60c7d
4 changed files with 4 additions and 4 deletions
  1. 1 1
      apt-pkg/contrib/fileutl.cc
  2. 1 1
      apt-pkg/contrib/gpgv.cc
  3. 1 1
      apt-pkg/deb/dpkgpm.cc
  4. 1 1
      methods/aptmethod.h

+ 1 - 1
apt-pkg/contrib/fileutl.cc

@@ -160,7 +160,7 @@ bool RunScripts(const char *Cnf)
 	 _error->Error("Problem executing scripts %s '%s'",Cnf,Opts->Value.c_str());
       }
       
-      return _error->Error("Sub-process returned an error code");
+      return _error->Error("Fileutil.cc Sub-process returned an error code");
    }
    
    return true;

+ 1 - 1
apt-pkg/contrib/gpgv.cc

@@ -295,7 +295,7 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
    if (WEXITSTATUS(Status) != 0)
    {
       // we forward the statuscode, so don't generate a message on the fd in this case
-      apt_error(std::cerr, -1, fd, _("Sub-process %s returned an error code (%u)"), "apt-key", WEXITSTATUS(Status));
+      apt_error(std::cerr, -1, fd, _("gpgv.cc Sub-process %s returned an error code (%u)"), "apt-key", WEXITSTATUS(Status));
       local_exit(WEXITSTATUS(Status));
    }
 

+ 1 - 1
apt-pkg/deb/dpkgpm.cc

@@ -2088,7 +2088,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
 	 if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV)
 	    strprintf(d->dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]);
 	 else if (WIFEXITED(Status) != 0)
-	    strprintf(d->dpkg_error, "Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
+	    strprintf(d->dpkg_error, "dpkgpm Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
 	 else
 	    strprintf(d->dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
 	 _error->Error("%s", d->dpkg_error.c_str());

+ 1 - 1
methods/aptmethod.h

@@ -70,7 +70,7 @@ public:
    }
    bool DebugEnabled() const
    {
-       //return true; //comment this in for more debug info
+       return true; //comment this in for more debug info
       if (methodNames.empty())
 	 return false;
       auto const sni = std::find_if_not(methodNames.crbegin(), methodNames.crend(), hasDoubleColon);