Avoid wedging the entire system if recoverable :/.

[apt.git] / apt-private / private-source.cc

diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc
index 220f1bd5a2f04471a9b3aec2f915bc18c2e0822a..1e819a6683c86bca3b1c1e0a4651534442f053c2 100644 (file)
--- a/apt-private/private-source.cc
+++ b/apt-private/private-source.cc
@@ -620,7 +620,9 @@ static void WriteBuildDependencyPackage(std::ostringstream &buildDepsPkgFile,
    for (auto const &dep: Dependencies)
    {
       std::string * type;
    for (auto const &dep: Dependencies)
    {
       std::string * type;

-      if (dep.Type == pkgSrcRecords::Parser::BuildConflict || dep.Type == pkgSrcRecords::Parser::BuildConflictIndep)
+      if (dep.Type == pkgSrcRecords::Parser::BuildConflict ||
+                 dep.Type == pkgSrcRecords::Parser::BuildConflictIndep ||
+                 dep.Type == pkgSrcRecords::Parser::BuildConflictArch)

         type = &conflicts;
       else
         type = &depends;
         type = &conflicts;
       else
         type = &depends;


@@ -644,7 +646,7 @@ static void WriteBuildDependencyPackage(std::ostringstream &buildDepsPkgFile,
 bool DoBuildDep(CommandLine &CmdL)
 {
    CacheFile Cache;
 bool DoBuildDep(CommandLine &CmdL)
 {
    CacheFile Cache;

-   std::vector<char const *> VolatileCmdL;
+   std::vector<std::string> VolatileCmdL;

    Cache.GetSourceList()->AddVolatileFiles(CmdL, &VolatileCmdL);
 
    _config->Set("APT::Install-Recommends", false);
    Cache.GetSourceList()->AddVolatileFiles(CmdL, &VolatileCmdL);
 
    _config->Set("APT::Install-Recommends", false);


@@ -702,18 +704,18 @@ bool DoBuildDep(CommandLine &CmdL)
       {
         for (size_t i = 0; i < VolatileSources.size(); ++i)
         {
       {
         for (size_t i = 0; i < VolatileSources.size(); ++i)
         {

-           char const * const Src = VolatileCmdL[i];
+           auto const Src = VolatileCmdL[i];

            if (DirectoryExists(Src))
            if (DirectoryExists(Src))

-              ioprintf(c1out, _("Note, using directory '%s' to get the build dependencies\n"), Src);
+              ioprintf(c1out, _("Note, using directory '%s' to get the build dependencies\n"), Src.c_str());

            else
            else

-              ioprintf(c1out, _("Note, using file '%s' to get the build dependencies\n"), Src);
+              ioprintf(c1out, _("Note, using file '%s' to get the build dependencies\n"), Src.c_str());

            std::unique_ptr<pkgSrcRecords::Parser> Last(VolatileSources[i]->CreateSrcParser());
            if (Last == nullptr)
            std::unique_ptr<pkgSrcRecords::Parser> Last(VolatileSources[i]->CreateSrcParser());
            if (Last == nullptr)

-              return _error->Error(_("Unable to find a source package for %s"), Src);
+              return _error->Error(_("Unable to find a source package for %s"), Src.c_str());

 
            std::string const pseudo = std::string("builddeps:") + Src;
            WriteBuildDependencyPackage(buildDepsPkgFile, pseudo, pseudoArch,
 
            std::string const pseudo = std::string("builddeps:") + Src;
            WriteBuildDependencyPackage(buildDepsPkgFile, pseudo, pseudoArch,

-                 GetBuildDeps(Last.get(), Src, StripMultiArch, hostArch));
+                 GetBuildDeps(Last.get(), Src.c_str(), StripMultiArch, hostArch));

            pseudoPkgs.emplace_back(pseudo, pseudoArch);
         }
       }
            pseudoPkgs.emplace_back(pseudo, pseudoArch);
         }
       }