From: Michael Vogt Date: Fri, 26 Mar 2010 15:04:49 +0000 (+0100) Subject: * apt-pkg/deb/dpkgpm.cc: X-Git-Tag: 0.8.0~17 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/47371b0047432ba7a5ee87173b00f912cdcd14e6?ds=inline;hp=-c * 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 --- 47371b0047432ba7a5ee87173b00f912cdcd14e6 diff --combined apt-pkg/deb/dpkgpm.cc index fb6054f79,8abe3f5c6..5b02cae1d --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@@ -946,6 -946,7 +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 @@@ -1063,7 -1064,7 +1064,7 @@@ // wait for input or output here FD_ZERO(&rfds); - if (!stdin_is_dev_null) + if (master >= 0 && !stdin_is_dev_null) FD_SET(0, &rfds); FD_SET(_dpkgin, &rfds); if(master >= 0) diff --combined cmdline/apt-get.cc index 5a814e255,d4fefa9c7..3c90354b0 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@@ -1317,9 -1317,11 +1317,11 @@@ pkgSrcRecords::Parser *FindSrc(const ch 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 +1388,8 @@@ 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) @@@ -1504,9 -1506,10 +1506,9 @@@ bool DoAutomaticRemove(CacheFile &Cache // only show stuff in the list that is not yet marked for removal if(Cache[Pkg].Delete() == false) { + ++autoRemoveCount; // we don't need to fill the strings if we don't need them - if (smallList == true) - ++autoRemoveCount; - else + if (smallList == false) { autoremovelist += string(Pkg.Name()) + " "; autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; @@@ -1519,12 -1522,9 +1521,12 @@@ if (doAutoRemove == false && (autoremovelist.empty() == false || autoRemoveCount != 0)) { if (smallList == false) - ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); + ShowList(c1out, P_("The following package is automatically installed and is no longer required:", + "The following packages were automatically installed and are no longer required:", + autoRemoveCount), autoremovelist, autoremoveversions); else - ioprintf(c1out, _("%lu packages were automatically installed and are no longer required.\n"), autoRemoveCount); + ioprintf(c1out, P_("%lu package was automatically installed and is no longer required.\n", + "%lu packages were automatically installed and are no longer required.\n", autoRemoveCount), autoRemoveCount); c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; } // Now see if we had destroyed anything (if we had done anything) diff --combined cmdline/apt-mark index 0e73dda78,466a56f27..31383d987 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@@ -19,10 -19,10 +19,10 @@@ def show_automatic(filename) if not os.path.exists(STATE_FILE): return auto = set() - tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) - while tagfile.Step(): - pkgname = tagfile.Section.get("Package") - autoInst = tagfile.Section.get("Auto-Installed") + tagfile = apt_pkg.TagFile(open(STATE_FILE)) + for section in tagfile: + pkgname = section.get("Package") + autoInst = section.get("Auto-Installed") if int(autoInst): auto.add(pkgname) print "\n".join(sorted(auto)) @@@ -33,24 -33,24 +33,24 @@@ def mark_unmark_automatic(filename, act # open the statefile if os.path.exists(STATE_FILE): try: - tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) + tagfile = apt_pkg.TagFile(open(STATE_FILE)) outfile = open(STATE_FILE+".tmp","w") except IOError, msg: print "%s, are you root?" % (msg) sys.exit(1) - while tagfile.Step(): - pkgname = tagfile.Section.get("Package") - autoInst = tagfile.Section.get("Auto-Installed") + for section in tagfile: + pkgname = section.get("Package") + autoInst = section.get("Auto-Installed") if pkgname in pkgs: if options.verbose: print "changing %s to %s" % (pkgname,action) - newsec = apt_pkg.RewriteSection(tagfile.Section, + newsec = apt_pkg.rewrite_section(section, [], [ ("Auto-Installed",str(action)) ]) pkgs.remove(pkgname) outfile.write(newsec+"\n") else: - outfile.write(str(tagfile.Section)+"\n") + outfile.write(str(section)+"\n") if action == 1: for pkgname in pkgs: if options.verbose: @@@ -78,10 -78,13 +78,13 @@@ if __name__ == "__main__" # get the state-file if not options.filename: - STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states" + STATE_FILE = apt_pkg.config.find_dir("Dir::State") + "extended_states" 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: diff --combined debian/changelog index 133d3874d,6a078c498..f166b7d32 --- a/debian/changelog +++ b/debian/changelog @@@ -1,83 -1,10 +1,97 @@@ -apt (0.7.25.4) UNRELEASED; urgency=low +apt (0.7.26~exp3) UNRELEASED; urgency=low + + [ Christian Perrier ] + * German translation update. Closes: #571037 + * Spanish manpages translation update. Closes: #573293 + * Dutch translation update. Closes: #573946 + * Polish manpages translation update. Closes: #574558 + * Add "manpages-pl (<< 20060617-3~)" to avoid file conflicts with + that package that was providing some manpages for APT utilities. + + [ Julian Andres Klode ] + * cmdline/apt-cache.cc: + - Change behavior of showsrc to match the one of show (Closes: #512046). + * cmdline/apt-key: + - Honor Apt::GPGV::TrustedKeyring (Closes: #316390) + * cmdline/apt-mark: + - Use the new python-apt API (and conflict with python-apt << 0.7.93.2). + * apt-inst/contrib/arfile.h: + - Add public ARArchive::Members() which returns the list of members. + * apt-pkg/policy.cc: + - Always return a candidate if there is at least one version pinned > 0 + (Closes: #512318) + * ftparchive/apt-ftparchive.cc: + - Read default configuration (Closes: #383257) + * debian/rules: + - 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 Wed, 24 Feb 2010 22:13:50 +0100 + +apt (0.7.26~exp2) experimental; urgency=low + + * fix crash when LANGUAGE is not set + + -- Michael Vogt Thu, 18 Feb 2010 22:07:23 +0100 + +apt (0.7.26~exp1) experimental; urgency=low + + [ David Kalnischkies ] + * [BREAK] add possibility to download and use multiply + Translation files, configurable with Acquire::Translation + (Closes: #444222, #448216, #550564) + * Ignore :qualifiers after package name in build dependencies + for now as long we don't understand them (Closes: #558103) + * apt-pkg/contrib/mmap.{cc,h}: + - extend it to have a growable flag - unused now but maybe... + * apt-pkg/pkgcache.h: + - use long instead of short for {Ver,Desc}File size, + patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917) + * apt-pkg/acquire-item.cc: + - allow also to skip the last patch if target is reached, + thanks Bernhard R. Link! (Closes: #545699) + * ftparchive/writer.{cc,h}: + - add --arch option for packages and contents commands + - if an arch is given accept only *_all.deb and *_arch.deb instead + of *.deb. Thanks Stephan Bosch for the patch! (Closes: #319710) + - add APT::FTPArchive::AlwaysStat to disable the too aggressive + caching if versions are build multiply times (not recommend) + Patch by Christoph Goehre, thanks! (Closes: #463260) + * apt-pkg/deb/dpkgpm.cc: + - stdin redirected to /dev/null takes all CPU (Closes: #569488) + Thanks to Aurelien Jarno for providing (again) a patch! + * buildlib/apti18n.h.in, po/makefile: + - add ngettext support with P_() + * aptconfiguration.cc: + - include all existing Translation files in the Cache (Closes: 564137) + * debian/control: + - update with no changes to debian policy 3.8.4 + * doc/apt_preferences.5.xml: + - explicitly warn against careless use (Closes: #567669) + * debian/rules: + - remove creation of empty dir /usr/share/apt + * doc/apt-cdrom.8.xml: + - fix typo spotted by lintian: proc(c)eed [ Ivan Masár ] * Slovak translation update. Closes: #568294 [ Michael Vogt ] - * merged lp:~mvo/apt/history + * [BREAK] merged lp:~mvo/apt/history - this writes a /var/log/apt/history tagfile that contains details from the transaction (complements term.log) * methods/http.cc: @@@ -90,13 -17,23 +104,13 @@@ * abicheck/ - add new abitest tester using the ABI Compliance Checker from http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker - * 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/indexfile.cc: - - deal correctly with three letter langcodes (LP: #391409) [ Robert Collins ] * Change the package index Info methods to allow apt-cache policy to be useful when using several different archives on the same host. (Closes: #329814, LP: #22354) - -- Michael Vogt Fri, 18 Dec 2009 16:54:18 +0100 + -- Michael Vogt Thu, 18 Feb 2010 16:11:39 +0100 apt (0.7.25.3) unstable; urgency=low diff --combined doc/examples/configure-index index f07302efd,133ce8e79..7166ec2b3 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@@ -275,15 -275,6 +275,15 @@@ Acquir Order { "gz"; "lzma"; "bz2"; }; }; + + Languages + { + "environment"; + "de"; + "en"; + "none"; + "fr"; + }; }; // Directory layout @@@ -418,6 -409,7 +418,7 @@@ Debu 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