The entire concept of PendingError() is flawed :/.

[apt.git] / apt-private / private-sources.cc

diff --git a/apt-private/private-sources.cc b/apt-private/private-sources.cc
index 6a32931ba167f86229b9677792dcaf2f16e160e3..587571760f6f339b26b72e5c95d31242da4130a9 100644 (file)
--- a/apt-private/private-sources.cc
+++ b/apt-private/private-sources.cc
@@ -7,11 +7,14 @@
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>

+#include <apt-pkg/cachefile.h>

 
 #include <apt-private/private-output.h>
 #include <apt-private/private-sources.h>
 #include <apt-private/private-utils.h>
 
 
 #include <apt-private/private-output.h>
 #include <apt-private/private-sources.h>
 #include <apt-private/private-utils.h>
 

+#include <sys/types.h>
+#include <sys/stat.h>

 #include <stddef.h>
 #include <unistd.h>
 #include <iostream>
 #include <stddef.h>
 #include <unistd.h>
 #include <iostream>


@@ -20,18 +23,19 @@
 #include <apti18n.h>
 
 /* Interface discussion with donkult (for the future):
 #include <apti18n.h>
 
 /* Interface discussion with donkult (for the future):

-  apt [add-{archive,release,component}|edit|change-release|disable]-sources 
+  apt [add-{archive,release,component}|edit|change-release|disable]-sources

  and be clever and work out stuff from the Release file
 */
 
  and be clever and work out stuff from the Release file
 */
 

-// EditSource - EditSourcesList                                        /*{{{*/
-// ---------------------------------------------------------------------
+// EditSource - EditSourcesList                                                /*{{{*/
+class APT_HIDDEN ScopedGetLock {
+public:
+   int fd;
+   ScopedGetLock(std::string const &filename) : fd(GetLock(filename)) {}
+   ~ScopedGetLock() { close(fd); }
+};

 bool EditSources(CommandLine &CmdL)
 {
 bool EditSources(CommandLine &CmdL)
 {

-   bool res;
-   pkgSourceList sl;
-   std::string outs;
-

    std::string sourceslist;
    if (CmdL.FileList[1] != NULL)
    {
    std::string sourceslist;
    if (CmdL.FileList[1] != NULL)
    {


@@ -44,34 +48,58 @@ bool EditSources(CommandLine &CmdL)
    HashString before;
    if (FileExists(sourceslist))
        before.FromFile(sourceslist);
    HashString before;
    if (FileExists(sourceslist))
        before.FromFile(sourceslist);

+   else
+   {
+      FileFd filefd;
+      if (filefd.Open(sourceslist, FileFd::Create | FileFd::WriteOnly, FileFd::None, 0644) == false)
+        return false;
+   }

 
 

-   int lockfd = GetLock(sourceslist);
-   if (lockfd < 0)
+   ScopedGetLock lock(sourceslist);
+   if (lock.fd < 0)

       return false;
       return false;

-      
+
+   bool res;
+   bool file_changed = false;

    do {
    do {

-      EditFileInSensibleEditor(sourceslist);
-      _error->PushToStack();
-      res = sl.Read(sourceslist);
-      if (!res) {
-         _error->DumpErrors(std::cerr, GlobalError::DEBUG, false);
-         strprintf(outs, _("Failed to parse %s. Edit again? "),
-                   sourceslist.c_str());
-         std::cout << outs;
+      if (EditFileInSensibleEditor(sourceslist) == false)
+        return false;
+      if (before.empty())
+      {
+        struct stat St;
+        if (stat(sourceslist.c_str(), &St) == 0 && St.st_size == 0)
+              RemoveFile("edit-sources", sourceslist);
+      }
+      else if (FileExists(sourceslist) && !before.VerifyFile(sourceslist))
+      {
+        file_changed = true;
+        pkgCacheFile::RemoveCaches();
+      }
+      pkgCacheFile CacheFile;
+      res = CacheFile.BuildCaches(nullptr);
+      if (res == false || _error->empty(GlobalError::WARNING) == false) {
+        std::string outs;
+        strprintf(outs, _("Failed to parse %s. Edit again? "), sourceslist.c_str());

          // FIXME: should we add a "restore previous" option here?
          // FIXME: should we add a "restore previous" option here?

-         res = !YnPrompt(true);
+         if (YnPrompt(outs.c_str(), true) == false)
+        {
+           if (res == false && _error->PendingError() == false)
+           {
+              CacheFile.Close();
+              pkgCacheFile::RemoveCaches();
+              res = CacheFile.BuildCaches(nullptr);
+           }
+           break;
+        }

       }
       }

-      _error->RevertToStack();

    } while (res == false);
    } while (res == false);

-   close(lockfd);

 
 

-   if (FileExists(sourceslist) && !before.VerifyFile(sourceslist)) {
-      strprintf(
-         outs, _("Your '%s' file changed, please run 'apt-get update'."),
+   if (res == true && file_changed == true)
+   {
+      ioprintf(
+         std::cout, _("Your '%s' file changed, please run 'apt-get update'."),

          sourceslist.c_str());
          sourceslist.c_str());

-      std::cout << outs << std::endl;

    }
    }

-
-   return true;
+   return res;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/