From: Michael Vogt <mvo@debian.org>
Date: Tue, 26 Nov 2013 08:22:40 +0000 (+0100)
Subject: add syntax check for sources.list
X-Git-Tag: 0.9.13.1~6^2^2~4
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d2524a53bbd219ee6d069006fd243a5bcda0245b

add syntax check for sources.list
---

diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index ef31d0029..38610e731 100644
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -67,9 +67,22 @@ bool EditSources(CommandLine &CmdL)
 
    // FIXME: take hash before, 
    //        when changed display message to apt update
-   //        do syntax check after save (like visudo)
-
-   EditFileInSensibleEditor(sourceslist);
+   bool res;
+   pkgSourceList sl;
+
+   do {
+      EditFileInSensibleEditor(sourceslist);
+      _error->PushToStack();
+      res = sl.Read(sourceslist);
+      if (!res) {
+         std::string outs;
+         strprintf(outs, _("Failed to parse %s. Edit again? "),
+                   sourceslist.c_str());
+         std::cout << outs;
+         res = !YnPrompt(true);
+      }
+      _error->RevertToStack();
+   } while (res == false);
 
    return true;
 }