Merge remote-tracking branch 'upstream/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 eb9c5b971e9d9d72f765e101937104f7ecb70cd1..301936b9db7101b96df2db473b4ca6304b393fef 100644 (file)
--- a/apt-private/private-sources.cc
+++ b/apt-private/private-sources.cc
@@ -1,10 +1,28 @@
+#include <config.h>
 
 #include <apt-pkg/hashes.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/cmndline.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+
+#include <apt-private/private-output.h>
+#include <apt-private/private-sources.h>
+#include <apt-private/private-utils.h>
+
+#include <stddef.h>
+#include <unistd.h>
+#include <iostream>
+#include <string>
+
 #include <apti18n.h>
 
-#include "private-output.h"
-#include "private-sources.h"
-#include "private-utils.h"
+/* Interface discussion with donkult (for the future):
+  apt [add-{archive,release,component}|edit|change-release|disable]-sources 
+ and be clever and work out stuff from the Release file
+*/
 
 // EditSource - EditSourcesList                                        /*{{{*/
 // ---------------------------------------------------------------------
@@ -14,26 +32,40 @@ bool EditSources(CommandLine &CmdL)
    pkgSourceList sl;
    std::string outs;
 
-   // FIXME: suport CmdL.FileList to specify sources.list.d files
-   std::string sourceslist = _config->FindFile("Dir::Etc::sourcelist");
-
+   std::string sourceslist;
+   if (CmdL.FileList[1] != NULL)
+   {
+      sourceslist = _config->FindDir("Dir::Etc::sourceparts") + CmdL.FileList[1];
+      if (!APT::String::Endswith(sourceslist, ".list"))
+         sourceslist += ".list";
+   } else {
+      sourceslist = _config->FindFile("Dir::Etc::sourcelist");
+   }
    HashString before;
-   before.FromFile(sourceslist);
+   if (FileExists(sourceslist))
+       before.FromFile(sourceslist);
 
+   int lockfd = GetLock(sourceslist);
+   if (lockfd < 0)
+      return false;
+      
    do {
       EditFileInSensibleEditor(sourceslist);
       _error->PushToStack();
       res = sl.Read(sourceslist);
       if (!res) {
+         _error->DumpErrors();
          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();
    } while (res == false);
+   close(lockfd);
 
-   if (!before.VerifyFile(sourceslist)) {
+   if (FileExists(sourceslist) && !before.VerifyFile(sourceslist)) {
       strprintf(
          outs, _("Your '%s' file changed, please run 'apt-get update'."),
          sourceslist.c_str());