Просмотр исходного кода

* apt-pkg/deb/dpkgpm.cc:
- fix backgrounding when dpkg runs (closes: #486222)
* cmdline/apt-mark:
- show error on incorrect aguments (LP: #517917), thanks to
Torsten Spindler
* cmdline/apt-get.cc:
- if apt-get source foo=version or foo/distro can not be found,
error out (LP: #502641)
* apt-pkg/packagemanager.cc:
- better debug output
* doc/examples/configure-index:
- add missing Debug::pkgPackageManager option

Michael Vogt лет назад: 16
Родитель
Сommit
47371b0047
6 измененных файлов с 31 добавлено и 5 удалено
  1. 1 0
      apt-pkg/deb/dpkgpm.cc
  2. 5 0
      apt-pkg/packagemanager.cc
  3. 7 5
      cmdline/apt-get.cc
  4. 3 0
      cmdline/apt-mark
  5. 14 0
      debian/changelog
  6. 1 0
      doc/examples/configure-index

+ 1 - 0
apt-pkg/deb/dpkgpm.cc

@@ -946,6 +946,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	    rtt = tt;
 	    cfmakeraw(&rtt);
 	    rtt.c_lflag &= ~ECHO;
+	    rtt.c_lflag |= ISIG;
 	    // block SIGTTOU during tcsetattr to prevent a hang if
 	    // the process is a member of the background process group
 	    // http://www.opengroup.org/onlinepubs/000095399/functions/tcsetattr.html

+ 5 - 0
apt-pkg/packagemanager.cc

@@ -338,6 +338,9 @@ bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
       return true;
    if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == false)
       return false;
+
+   if (Debug) 
+      std::clog << OutputInDepth(Depth) << "DepAdd: " << Pkg.Name() << std::endl;
       
    // Put the package on the list
    OList.push_back(Pkg);
@@ -391,6 +394,8 @@ bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
       
       if (Bad == true)
       {
+	 if (Debug) 
+	    std::clog << OutputInDepth(Depth) << "DepAdd FAILS on: " << Pkg.Name() << std::endl;
 	 OList.Flag(Pkg,0,pkgOrderList::Added);
 	 OList.pop_back();
 	 Depth--;

+ 7 - 5
cmdline/apt-get.cc

@@ -1317,9 +1317,11 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
 	 if (Src.empty() == true) 
 	 {
 	    // Sources files have no codename information
-	    if (VerTag.empty() == true && DefRel.empty() == false)
-	       _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
-	    DefRel.clear();
+	    if (VerTag.empty() == true && DefRel.empty() == false) 
+	    {
+	       _error->Error(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
+	       return 0;
+	    }
 	 }
       }
       if (Src.empty() == true)
@@ -1386,8 +1388,8 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
       if (Last != 0 || VerTag.empty() == true)
 	 break;
       //if (VerTag.empty() == false && Last == 0)
-      _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
-      VerTag.clear();
+      _error->Error(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
+      return 0;
    }
 
    if (Last == 0 || Last->Jump(Offset) == false)

+ 3 - 0
cmdline/apt-mark

@@ -82,6 +82,9 @@ if __name__ == "__main__":
     else:
         STATE_FILE=options.filename
 
+    if len(args) == 0:
+        parser.error("first argument must be 'markauto', 'unmarkauto' or 'showauto'")
+
     if args[0] == "showauto":
         show_automatic(STATE_FILE)
     else:

+ 14 - 0
debian/changelog

@@ -26,6 +26,20 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low
     - Fix the libraries name to be e.g. libapt-pkg4.9 instead of
       libapt-pkg-4.9.
 
+  [ Michael Vogt ]
+  * apt-pkg/deb/dpkgpm.cc:
+    - fix backgrounding when dpkg runs (closes: #486222)
+  * cmdline/apt-mark:
+    - show error on incorrect aguments (LP: #517917), thanks to
+      Torsten Spindler
+  * cmdline/apt-get.cc:
+    - if apt-get source foo=version or foo/distro can not be found,
+      error out (LP: #502641)
+  * apt-pkg/packagemanager.cc:
+    - better debug output 
+  * doc/examples/configure-index:
+    - add missing Debug::pkgPackageManager option
+
  -- Christian Perrier <bubulle@debian.org>  Wed, 24 Feb 2010 22:13:50 +0100
 
 apt (0.7.26~exp2) experimental; urgency=low

+ 1 - 0
doc/examples/configure-index

@@ -418,6 +418,7 @@ Debug
   pkgDPkgPM "false";
   pkgDPkgProgressReporting "false";
   pkgOrderList "false";
+  pkgPackageManager "false"; // OrderList/Configure debugging
   pkgAutoRemove "false";   // show information about automatic removes
   BuildDeps "false";
   pkgInitialize "false";   // This one will dump the configuration space