Port TagIterator to correctly support ReMap (doh).

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

diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc
index 5053c60fc41ba144585978e97cf66d52b46db3f5..1e819a6683c86bca3b1c1e0a4651534442f053c2 100644 (file)
--- a/apt-private/private-source.cc
+++ b/apt-private/private-source.cc
@@ -438,6 +438,7 @@ bool DoSource(CommandLine &CmdL)
         {
            ioprintf(c1out, "Skipping download of file '%s' as requested hashsum is not available for authentication\n",
                  localFile.c_str());
+           Dsc[J].Dsc.clear();
            continue;
         }
 
@@ -478,8 +479,8 @@ bool DoSource(CommandLine &CmdL)
    {
       pkgAcquire::UriIterator I = Fetcher.UriBegin();
       for (; I != Fetcher.UriEnd(); ++I)
-        std::cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
-           I->Owner->FileSize << ' ' << I->Owner->HashSum() << std::endl;
+        std::cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' <<
+           std::to_string(I->Owner->FileSize) << ' ' << I->Owner->HashSum() << std::endl;
       return true;
    }
 
@@ -619,7 +620,9 @@ static void WriteBuildDependencyPackage(std::ostringstream &buildDepsPkgFile,
    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;
@@ -643,7 +646,7 @@ static void WriteBuildDependencyPackage(std::ostringstream &buildDepsPkgFile,
 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);
@@ -701,18 +704,18 @@ bool DoBuildDep(CommandLine &CmdL)
       {
         for (size_t i = 0; i < VolatileSources.size(); ++i)
         {
-           char const * const Src = VolatileCmdL[i];
+           auto const Src = VolatileCmdL[i];
            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
-              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)
-              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,
-                 GetBuildDeps(Last.get(), Src, StripMultiArch, hostArch));
+                 GetBuildDeps(Last.get(), Src.c_str(), StripMultiArch, hostArch));
            pseudoPkgs.emplace_back(pseudo, pseudoArch);
         }
       }