Merge branch 'debian/sid' into debian/experimental

Conflicts:
	apt-private/private-list.cc
	configure.ac
	debian/apt.install.in
	debian/changelog

1 files changed, 64 insertions, 0 deletions

diff --git a/apt-private/private-sources.cc b/apt-private/private-sources.cc
new file mode 100644
index 000000000..41cf6b313
--- /dev/null
+++ b/apt-private/private-sources.cc
@@ -0,0 +1,64 @@
+
+#include <apt-pkg/hashes.h>
+#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         			        /*{{{*/
+// ---------------------------------------------------------------------
+bool EditSources(CommandLine &CmdL)
+{
+   bool res;
+   pkgSourceList sl;
+   std::string outs;
+
+   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;
+   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 (FileExists(sourceslist) && !before.VerifyFile(sourceslist)) {
+      strprintf(
+         outs, _("Your '%s' file changed, please run 'apt-get update'."),
+         sourceslist.c_str());
+      std::cout << outs << std::endl;
+   }
+
+   return true;
+}
+									/*}}}*/