move EditSources into its own file

diff --git a/apt-private/makefile b/apt-private/makefile
index b3d764097d57bfa2e5e4e2921eb34fc3afb8dd10..728890b9bec6b4025f97c009d78f58f8475c61f7 100644 (file)
--- a/apt-private/makefile
+++ b/apt-private/makefile
@@ -17,7 +17,7 @@ MAJOR=0.0
 MINOR=0
 SLIBS=$(PTHREADLIB) -lapt-pkg
 
 MINOR=0
 SLIBS=$(PTHREADLIB) -lapt-pkg
 

-PRIVATES=list install download output cachefile cacheset update upgrade cmndline moo search show main utils
+PRIVATES=list install download output cachefile cacheset update upgrade cmndline moo search show main utils sources

 SOURCE += $(foreach private, $(PRIVATES), private-$(private).cc)
 HEADERS += $(foreach private, $(PRIVATES), private-$(private).h)
 
 SOURCE += $(foreach private, $(PRIVATES), private-$(private).cc)
 HEADERS += $(foreach private, $(PRIVATES), private-$(private).h)
 

diff --git a/apt-private/private-sources.cc b/apt-private/private-sources.cc
new file mode 100644 (file)
index 0000000..eb9c5b9
--- /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;
+}
+                                                                       /*}}}*/

diff --git a/apt-private/private-sources.h b/apt-private/private-sources.h
new file mode 100644 (file)
index 0000000..b394622
--- /dev/null
+++ b/apt-private/private-sources.h
@@ -0,0 +1,3 @@
+#include <apt-pkg/cmndline.h>
+
+bool EditSources(CommandLine &CmdL);

diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 47187fac279d219e2fe8cc75466c73dcc40af492..4bcae0aba8ac71a07f9bc30d4e2679e899d83af7 100644 (file)
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -56,45 +56,9 @@
 #include <apt-private/private-show.h>
 #include <apt-private/private-main.h>
 #include <apt-private/private-utils.h>
 #include <apt-private/private-show.h>
 #include <apt-private/private-main.h>
 #include <apt-private/private-utils.h>

+#include <apt-private/private-sources.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;
-}
-                                                                       /*}}}*/

 
 
 bool ShowHelp(CommandLine &CmdL)
 
 
 bool ShowHelp(CommandLine &CmdL)