Merge remote-tracking branch 'mvo/debian/sid' into debian/sid

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

diff --git a/apt-private/private-sources.cc b/apt-private/private-sources.cc
index 37b0534bda63d63334644df67ad46583ee28b9b3..65706e785fcdf451caa214e858fa903e0f900ee5 100644 (file)
--- a/apt-private/private-sources.cc
+++ b/apt-private/private-sources.cc
@@ -21,10 +21,13 @@ bool EditSources(CommandLine &CmdL)
 
    std::string sourceslist;
    if (CmdL.FileList[1] != NULL)
 
    std::string sourceslist;
    if (CmdL.FileList[1] != NULL)

-      sourceslist = _config->FindDir("Dir::Etc::sourceparts") + CmdL.FileList[1] + ".list";
-   else
+   {
+      sourceslist = _config->FindDir("Dir::Etc::sourceparts") + CmdL.FileList[1];
+      if (!APT::String::Endswith(sourceslist, ".list"))
+         sourceslist += ".list";
+   } else {

       sourceslist = _config->FindFile("Dir::Etc::sourcelist");
       sourceslist = _config->FindFile("Dir::Etc::sourcelist");

-
+   }

    HashString before;
    if (FileExists(sourceslist))
        before.FromFile(sourceslist);
    HashString before;
    if (FileExists(sourceslist))
        before.FromFile(sourceslist);


@@ -38,6 +41,7 @@ bool EditSources(CommandLine &CmdL)
          strprintf(outs, _("Failed to parse %s. Edit again? "),
                    sourceslist.c_str());
          std::cout << outs;
          strprintf(outs, _("Failed to parse %s. Edit again? "),
                    sourceslist.c_str());
          std::cout << outs;

+         // FIXME: should we add a "restore previous" option here?

          res = !YnPrompt(true);
       }
       _error->RevertToStack();
          res = !YnPrompt(true);
       }
       _error->RevertToStack();