From 9e6b13f3751f8a1287ff79861980afb7792a5f9e Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Thu, 28 Nov 2013 12:15:47 +0100
Subject: move EditSources into its own file

---
 apt-private/private-sources.cc | 45 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 apt-private/private-sources.cc

(limited to 'apt-private/private-sources.cc')

diff --git a/apt-private/private-sources.cc b/apt-private/private-sources.cc
new file mode 100644
index 000000000..eb9c5b971
--- /dev/null
+++ b/apt-private/private-sources.cc
@@ -0,0 +1,45 @@
+
+#include <apt-pkg/hashes.h>
+#include <apti18n.h>
+
+#include "private-output.h"
+#include "private-sources.h"
+#include "private-utils.h"
+
+// EditSource - EditSourcesList         			        /*{{{*/
+// ---------------------------------------------------------------------
+bool EditSources(CommandLine &CmdL)
+{
+   bool res;
+   pkgSourceList sl;
+   std::string outs;
+
+   // FIXME: suport CmdL.FileList to specify sources.list.d files
+   std::string sourceslist = _config->FindFile("Dir::Etc::sourcelist");
+
+   HashString before;
+   before.FromFile(sourceslist);
+
+   do {
+      EditFileInSensibleEditor(sourceslist);
+      _error->PushToStack();
+      res = sl.Read(sourceslist);
+      if (!res) {
+         strprintf(outs, _("Failed to parse %s. Edit again? "),
+                   sourceslist.c_str());
+         std::cout << outs;
+         res = !YnPrompt(true);
+      }
+      _error->RevertToStack();
+   } while (res == false);
+
+   if (!before.VerifyFile(sourceslist)) {
+      strprintf(
+         outs, _("Your '%s' file changed, please run 'apt-get update'."),
+         sourceslist.c_str());
+      std::cout << outs << std::endl;
+   }
+
+   return true;
+}
+									/*}}}*/
-- 
cgit v1.2.3


From a8f671c17a7f34e80a49bf367bceaa009551b066 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Fri, 29 Nov 2013 08:17:44 +0100
Subject: add support for "apt edit-source foo" sources.list.d component
 editing

---
 apt-private/private-sources.cc | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'apt-private/private-sources.cc')

diff --git a/apt-private/private-sources.cc b/apt-private/private-sources.cc
index eb9c5b971..37b0534bd 100644
--- a/apt-private/private-sources.cc
+++ b/apt-private/private-sources.cc
@@ -6,6 +6,11 @@
 #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         			        /*{{{*/
 // ---------------------------------------------------------------------
 bool EditSources(CommandLine &CmdL)
@@ -14,17 +19,22 @@ 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] + ".list";
+   else
+      sourceslist = _config->FindFile("Dir::Etc::sourcelist");
 
    HashString before;
-   before.FromFile(sourceslist);
+   if (FileExists(sourceslist))
+       before.FromFile(sourceslist);
 
    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;
@@ -33,7 +43,7 @@ bool EditSources(CommandLine &CmdL)
       _error->RevertToStack();
    } while (res == false);
 
-   if (!before.VerifyFile(sourceslist)) {
+   if (FileExists(sourceslist) && !before.VerifyFile(sourceslist)) {
       strprintf(
          outs, _("Your '%s' file changed, please run 'apt-get update'."),
          sourceslist.c_str());
-- 
cgit v1.2.3


From cf993341c2067ee091cfd51e5da0e237babce171 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Fri, 29 Nov 2013 08:35:05 +0100
Subject: add "APT::String::Endswith" and automatic adding of ".list" in apt
 edit-source

---
 apt-private/private-sources.cc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'apt-private/private-sources.cc')

diff --git a/apt-private/private-sources.cc b/apt-private/private-sources.cc
index 37b0534bd..65706e785 100644
--- 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)
-      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");
-
+   }
    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;
+         // FIXME: should we add a "restore previous" option here?
          res = !YnPrompt(true);
       }
       _error->RevertToStack();
-- 
cgit v1.2.3