From 87abbbd44bfcb0e95ff1deda2426e720d18ad717 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 14 Oct 2009 19:21:19 +0000 Subject: [PATCH] Merged from trunk -r14556:14567 | 14557 | Document 'backtracking' in the MASKED PACKAGES section. | | zmedico | | | 14559 | Discard the log on success, since otherwise we'll have | | zmedico | multiple log files for the same package. | | 14561 | Add a note about --update and bug #275945 for 2.1.7. | | zmedico | | | 14562 | Fix formatting. | | zmedico | | | 14564 | Add notes about python3 support. | | zmedico | | svn path=/main/branches/prefix/; revision=14602 --- NEWS | 2 ++ RELEASE-NOTES | 11 +++++++++++ man/emerge.1 | 7 +++++++ pym/_emerge/BinpkgVerifier.py | 10 +++++++++- 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 42f985d79..c66b4e8cd 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,8 @@ portage-2.1.7 * Add --accept-properties option for emerge which allows you to use --accept-properties=-interactive in order to temporarily exclude interactive updates. +* Add support for Python 3.0. At least Python 2.6 is now required in order to + support the new syntax which is used by Python 3.0. portage-2.1.6 ------------- diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 0265af1c1..57274f942 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -21,6 +21,17 @@ portage-2.2 * "world" no longer includes "system" unconditionally, but you can add "@system" to the world_sets file to restore the old state. +portage-2.1.7 +================================== +* Default behavior for emerge commands has changed so that packages are only + updated when necessary. In order to ensure that all packages are updated + when possible, you must now specify the -u/--update option. See bug #275945 + for the rationale behind this change. +* If using python3, you may notice that some types of program output which + require a tty device (like the wget progress bar) will be disabled. This + is due to an upstream python issue: http://bugs.python.org/issue5380. See + bug #287648 for more information. + portage-2.1.6.12 ================================== * If you want overlay eclasses to override eclasses from other repos then see diff --git a/man/emerge.1 b/man/emerge.1 index 23f44286d..7edd905fc 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -653,6 +653,13 @@ to find out how to unmask in various cases. Also note that if you give \fBemerge\fR an ebuild, then all forms of masking will be ignored and \fBemerge\fR will attempt to emerge the package. .TP +.BR backtracking +When packages are masked for \fBbacktracking\fR, it means that the dependency +resolver has temporarily masked them in order to avoid dependency conflicts +and/or unsatisfied dependencies. This type of mask is typically accompanied +by a message about a missed package update which has been skipped in order to +avoid dependency conflicts and/or unsatisfied dependencies. +.TP .BR package.mask The \fBpackage.mask\fR file primarily blocks the use of packages that cause problems or are known to have issues on different systems. It resides in diff --git a/pym/_emerge/BinpkgVerifier.py b/pym/_emerge/BinpkgVerifier.py index 404becf09..d36958717 100644 --- a/pym/_emerge/BinpkgVerifier.py +++ b/pym/_emerge/BinpkgVerifier.py @@ -54,7 +54,15 @@ class BinpkgVerifier(AsynchronousTask): writemsg("!!! Expected: %s\n" % e.value[3], noiselevel=-1) rval = 1 - if rval != os.EX_OK: + if rval == os.EX_OK: + # If this was successful, discard the log here since otherwise + # we'll get multiple logs for the same package. + if log_file is not None: + try: + os.unlink(self.logfile) + except OSError: + pass + else: pkg_path = bintree.getname(pkg.cpv) head, tail = os.path.split(pkg_path) temp_filename = portage._checksum_failure_temp_file(head, tail) -- 2.26.2