add basic "edit-sources" command

2 files changed, 25 insertions, 18 deletions

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 15373b050..912b2d609 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -59,6 +59,7 @@
 #include <apt-private/private-update.h>
 #include <apt-private/private-cmndline.h>
 #include <apt-private/private-moo.h>
+#include <apt-private/private-utils.h>
 
 #include <apt-private/acqprogress.h>
 
@@ -1378,24 +1379,6 @@ bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher,
    return _error->Error("changelog download failed");
 }
 									/*}}}*/
-// DisplayFileInPager - Display File with pager        			/*{{{*/
-void DisplayFileInPager(string filename)
-{
-   pid_t Process = ExecFork();
-   if (Process == 0)
-   {
-      const char *Args[3];
-      Args[0] = "/usr/bin/sensible-pager";
-      Args[1] = filename.c_str();
-      Args[2] = 0;
-      execvp(Args[0],(char **)Args);
-      exit(100);
-   }
-         
-   // Wait for the subprocess
-   ExecWait(Process, "sensible-pager", false);
-}
-									/*}}}*/
 // DoChangelog - Get changelog from the command line			/*{{{*/
 // ---------------------------------------------------------------------
 bool DoChangelog(CommandLine &CmdL)
diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index e30967ec2..ef31d0029 100644
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -54,8 +54,28 @@
 #include <apt-private/private-upgrade.h>
 #include <apt-private/private-show.h>
 #include <apt-private/private-main.h>
+#include <apt-private/private-utils.h>
 									/*}}}*/
 
+// EditSource - EditSourcesList         			        /*{{{*/
+// ---------------------------------------------------------------------
+bool EditSources(CommandLine &CmdL)
+{
+   // FIXME: suport CmdL.FileList to specify sources.list.d files
+
+   std::string sourceslist = _config->FindFile("Dir::Etc::sourcelist");
+
+   // FIXME: take hash before, 
+   //        when changed display message to apt update
+   //        do syntax check after save (like visudo)
+
+   EditFileInSensibleEditor(sourceslist);
+
+   return true;
+}
+									/*}}}*/
+
+
 bool ShowHelp(CommandLine &CmdL)
 {
    ioprintf(c1out,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
@@ -74,6 +94,8 @@ bool ShowHelp(CommandLine &CmdL)
       " update - update list of available packages\n"
       " install - install packages\n"
       " upgrade - upgrade the systems packages\n"
+      "\n"
+      " edit-sources - edit the source information file\n"
        );
    
    return true;
@@ -89,6 +111,8 @@ int main(int argc, const char *argv[])					/*{{{*/
                                    {"remove", &DoInstall},
                                    {"update",&DoUpdate},
                                    {"upgrade",&DoUpgradeWithAllowNewPackages},
+                                   // misc
+                                   {"edit-sources",&EditSources},
                                    // helper
                                    {"moo",&DoMoo},
                                    {"help",&ShowHelp},