git.tremily.us Git - portage.git/log

Don't spit out ${D}

svn path=/main/branches/prefix/; revision=8005

Vimdiff with trunk to make python happy

svn path=/main/branches/prefix/; revision=7964

   Merged from trunk 7903:7908

   | 7904     | In the EbuildQuote check, combine the var_assignment regex  |
   | zmedico  | together with the ignore_line regex. This also fixes an     |
   |          | issue with the var_assignment regex allowing violations     |
   |          | like `make DESTDIR=${D}` to slip through.                   |

   | 7905     | Eliminate confusing false positive error messages for       |
   | zmedico  | SRC_URI.syntax and digestentry.unused that are reported     |
   |          | when the SRC_URI for one or more ebuilds can't be parsed    |
   |          | for some reason. There's no point in producing a false      |
   |          | error here since the root cause will produce a valid error  |
   |          | elsewhere, such as "SRC_URI.syntax" or "ebuild.sytax".      |
   |          | Also, update the docs for the "ebuild.syntax" error to      |
   |          | indicate that a digest verification failure can trigger it. |

   | 7907     | this isnt part of gentoolkit anymore                        |
   | SpankMan |                                                             |

   | 7908     | no need to use "function" when defining a function          |
   | SpankMan |                                                             |

svn path=/main/branches/prefix/; revision=7953

1 tab -> 4 spaces.

Mixing those upsets python. It appears this file is using spaces
instead of tabs, i.e. it is not consistent with the other python files
which use tabs.

svn path=/main/branches/prefix/; revision=7903

Align with zmedico

svn path=/main/branches/prefix/; revision=7889

- only use PORTAGE_TMPDIR /after/ it is set
- don't chown ${TMP} to what in theory should be our own, especially
since GID isn't set.

svn path=/main/branches/prefix/; revision=7888

Portage generates ED (and D) with a trailing /, this means that at least
internally we can do things right and avoid double slashes. This solves
at least gtk+-2.12.0 compilation which uses einstall. libtool isn't
charmed by the double slashes.

svn path=/main/branches/prefix/; revision=7886

Moved EPREFIX check from late-die when installing a binary package to
resolving phase, like the CHOST check.

svn path=/main/branches/prefix/; revision=7885

   Merged from trunk 7838:7877

   | 7839     | someone seriously screwed the pooch on whitespacing here so |
   | SpankMan | clean it all up                                             |

   | 7840     | Fix a typo.                                                 |
   | zmedico  |                                                             |

   | 7842     | align the filename and line numbers in the output of the    |
   | SpankMan | stack dump so that it is much easier to read                |

   | 7844     | Display a short notification when an existing               |
   | zmedico  | ${T}/environment sourced since it is easy to ignore and     |
   |          | ignorance of it often leads to mysterious problems and      |
   |          | general confusion. This message should not show in cases    |
   |          | where it is obviously irrelevant, FEATURES=noauto, or       |
   |          | PORTAGE_QUIET=1.                                            |

   | 7846     | Do the stale env check/warning after the digest/manifest    |
   | zmedico  | phase when necessary.                                       |

   | 7848     | Bug #193486 - Use xargs to avoid 'bash: /bin/rm: Argument   |
   | zmedico  | list too long' errors. This patch uses a weird tr '\001'    |
   |          | '\000' workaround since bash doesn't echo null bytes like   |
   |          | one might expect.                                           |

   | 7850     | Bug #193486 - Use echo -n and properly quote the array      |
   | zmedico  | argument.                                                   |

   | 7852     | with help from Donnie and Ulrich, use sed to extract the    |
   | SpankMan | statement that led to the call to die so we can print it    |
   |          | out in our error message                                    |

   | 7853     | Bug #194025 - Lock /var/db/pkg in post_merge() during the   |
   | zmedico  | "Regenerating GNU info directory index" routine.            |

   | 7856     | Ignore ENOTDIR from unmerge unlink calls.                   |
   | zmedico  |                                                             |

   | 7858     | Move a newline to fix formatting.                           |
   | zmedico  |                                                             |

   | 7861     | Simplify update_eclasses() a little.                        |
   | zmedico  |                                                             |

   | 7864     | Move prelink tempfile cleanup to the finally block and      |
   | zmedico  | remove unused locking code.                                 |

   | 7866     | Handle KeyError thrown from aux_get().                      |
   | zmedico  |                                                             |

   | 7869     | Bug #194081 - Add EBUSY to the list of ignored errnos for   |
   | zmedico  | unlink and rmdir calls during unmerge.                      |

   | 7871     | Bug #193548 - When emerge spawns find to search for config  |
   | zmedico  | updates, show the find output if there is an error.         |

   | 7873     | When scanning for config updates, treat a symlink to an     |
   | zmedico  | existing directory as if it's just a normal directory.      |

   | 7875     | Bug #193548 - When scanning for config updates and an error |
   | zmedico  | occurs, send find's stdout to /dev/null so that only an     |
   |          | error message is shown.                                     |

   | 7877     | Bug #194095 - Validate dispatch-conf input in order to      |
   | zmedico  | prevent spurious input characters from being interpreted as |
   |          | user input (which can be quite confusing and gives an "out  |
   |          | of control" feeling).                                       |

svn path=/main/branches/prefix/; revision=7883

   Merged from trunk 7792:7838

   | 7793     | When --with-bdeps=y is enabled for built packages, pull in  |
   | zmedico  | build time deps as requested, but marked them as            |
   |          | "satisfied" since they are not strictly required. This      |
   |          | allows more freedom in the merge order calculation for      |
   |          | solving circular dependencies. Don't convert to PDEPEND     |
   |          | since that could make --with-bdeps=y less effective if it   |
   |          | is used to adjust merge order to prevent built_with_use()   |
   |          | calls from failing.                                         |

   | 7794     | Flush stdout before calling pkg_info() to ensure that       |
   | zmedico  | output always shows in the correct order.                   |

   | 7795     | Flush stderr and stdout if their file descriptors are in    |
   | zmedico  | fd_pipes at the beginning of spawn().                       |

   | 7796     | In spawn(), initialize default fd_pipes before doing the    |
   | zmedico  | stdout/stderr flush.                                        |

   | 7797     | When --deep is not enabled, many dependencies are dicarded  |
   | zmedico  | and left out of the digraph. This patch prevents            |
   |          | dependencies from being discarded in some cases where the   |
   |          | are needed in order to optimize merge order. It also        |
   |          | modifies the DepPriority.rebuild attribute so that it only  |
   |          | applies to build time dependencies. This leads to better    |
   |          | merge order in some cases when --deep is not enabled. For   |
   |          | example, `emerge xf86-input-keyboard xorg-server` will now  |
   |          | properly merge xorg-server before xf86-input-keyboard       |
   |          | (problem from bug #192254, comment #5).                     |

   | 7798     | tweak get_config() so that it only executes one external    |
   | SpankMan | binary (sed) instead of chaining multiple ones              |

   | 7799     | fix possible information leak vulnerability when doing a    |
   | SpankMan | merge of configuration files and be better about handling   |
   |          | of whitespace in $TMP in a few places                       |

   | 7800     | s/note/not/ reported by p-y.                                |
   | zmedico  |                                                             |

   | 7801     | Bug #190179 - Use `prelink --verify filename` to write the  |
   | zmedico  | temp file via stdout since --undo fails when run as a       |
   |          | normal non-superuser because it tries to chown the output   |
   |          | file. Also, use mkstemp() to eliminate the need for locking |
   |          | the temp file. Thanks to Israel G. Lugo                     |
   |          | <israel.lugo@lugosys.com> for the initial patch.            |

   | 7802     | Initialize ${TMP} before registering the die trap so that   |
   | zmedico  | we're sure which directory die will clean up.               |

   | 7803     | Bug #74615 - Quote all file paths inside dispatch-conf      |
   | zmedico  | shell commands.                                             |

   | 7804     | Bugs #168772 and #193695 - During unmerge, only ignore      |
   | zmedico  | specific exceptions raised from unlink() and rmdir() calls. |

   | 7805     | Bug #193695 - Add support for FreeBSD chflags during        |
   | zmedico  | unmerge. This code is adapted from the code that already    |
   |          | exists in movefile() for the merge phase.                   |

   | 7806     | In movefile() FreeBSD chflags handling, use chflags instead |
   | zmedico  | of lchflags when temporarily adjusting the flags on the     |
   |          | parent directory since we want to follow any symlinks to    |
   |          | the real parent directory.                                  |

   | 7807     | Bug #193695 - Add FreeBSD chflags support for rmdir() calls |
   | zmedico  | during unmerge.                                             |

   | 7808     | Bug #192341 - Eliminate the dependency on py-freebsd by     |
   | zmedico  | implementing it's chflags() and lchflags() functions as     |
   |          | wrappers around the chflags command (which should always be |
   |          | available in any case). The functions are only called when  |
   |          | merging/unmerging files that actually have flags set so the |
   |          | performance difference should be negligible.                |

   | 7834     | Bug #192341 - When the chflags command does not exit        |
   | zmedico  | successfully, try to generate an informative error. First,  |
   |          | use stat or lstat to try and generate an ENOENT error. It   |
   |          | the path exists, verify that the chflags binary exists and  |
   |          | raise CommandNotFound if necessary. Finally, simply         |
   |          | generate an EPERM OSError with the output of the command    |
   |          | since we're not sure exactly why it failed or what the real |
   |          | errno was.                                                  |

   | 7835     | Set non-blocking mode on the pty master file descriptor     |
   | zmedico  | while the slave file descriptor is still held open since    |
   |          | otherwise the fcntl call can fail on FreeBSD (the child     |
   |          | process might have already exited and closed the slave file |
   |          | descriptor so we have to keep it open in order to avoid     |
   |          | FreeBSD potentially generating an EAGAIN exception). This   |
   |          | appoach is cleaner than triggering the exception and being  |
   |          | forced to handle it somehow.                                |

   | 7838     | Bug #192706 - Do not print a summary at the end of          |
   | zmedico  | --depclean if there is nothing to clean and --quiet is      |
   |          | enabled.                                                    |

svn path=/main/branches/prefix/; revision=7882

Remove CHOST mismatch logic since zmedico now implemented CHOST matching
during the dependency calculation phase.

svn path=/main/branches/prefix/; revision=7881

typo

svn path=/main/branches/prefix/; revision=7788

Vimdiffed with trunk to reduce differences to a minimum.

svn path=/main/branches/prefix/; revision=7787

Avoid warnings on Linux (only tested Darwin and Solaris, sigh...)

svn path=/main/branches/prefix/; revision=7725

Implement QA check for install_names (libraries linked to, and their
location) on Darwin, such that we can detect upfront if something is
going to error out during runtime. Try to correct invalid install_names
if they are in the image, which can be a result of gen_usr_ldscript
library movements and breaks any tool shipped with that library itself,
e.g. libiconv's `iconv` utility.

svn path=/main/branches/prefix/; revision=7724

<zmedico> grobian: in python, there are built-in constants True and False
(must be capitalized). you wanted to use True in r7721.

svn path=/main/branches/prefix/; revision=7723

Quote, such that python doesn't bail out

svn path=/main/branches/prefix/; revision=7721

It looks nicer if we just say

>>> Emerging (1 of 1) sys-devel/autoconf-wrapper-4-r3 to /
>>> Extracting info
!!! Incompatible binary package: made for x86_64-pc-linux-gnu, you are
on i386-pc-solaris2.10

instead of some backtrace because formatter arguments do not match the
expected number.

svn path=/main/branches/prefix/; revision=7717

Apparently it was a bit too late yesterday. I meant to add EPREFIX, not
EAPI.

svn path=/main/branches/prefix/; revision=7715

Add EPREFIX as env setting, such that we can retrieve it as file from
the binary package. If it's absent, abort mission. Drop EAPI check, as
that should be dealt with in other code already. (But having an EPREFIX
file implicitly says we have EAPI=prefix anyway...)

svn path=/main/branches/prefix/; revision=7708

A first shot at binary packages support for prefix.  In itself, binary
packages work fine of course, but once you want to share the binary
package between users with different prefixes (like from a binhost),
then you need to cope with that.  After some testing chpathtool appears
to be able to successfully change paths encoded in binaries, in order to
adjust to the proper prefix.  For a binhost setting, binary packages
need to have an artificially long and annoying prefix to make it work
the most people.

svn path=/main/branches/prefix/; revision=7706

Don't remove files which the ebuild lateron tries to install

svn path=/main/branches/prefix/; revision=7703

   Merged from trunk 7646:7695

   | 7647      | Fix ACCEPT_KEYWORDS validation so that ** is valid.        |
   | zmedico   |                                                            |

   | 7651      | Just use os.listdir() since portage.listdir() is           |
   | zmedico   | unnecessary.                                               |

   | 7652      | Try harder to figure out what OS we are running            |
   | WarnerBro |                                                            |

   | 7653      | Bug #189743 - Add .jpeg to the list of extensions          |
   | zmedico   | supported by dohtml.                                       |

   | 7655      | Show cache miss/hit counts all on one line, using \r to    |
   | zmedico   | return to the beginning of he line and rewrite it each     |
   |           | time that a counter is updated. Thanks to Mike "Fuzzy"     |
   |           | Partin <fuzzy@smoke.dope.org> for this patch (submitted on |
   |           | the gentoo-portage-dev mailing list).                      |

   | 7656      | Send cache hit/miss status updates to stdout instead of    |
   | zmedico   | stderr and add some more flush() calls.                    |

   | 7659      | Make --info detect more /etc/*-release files as suggested  |
   | zmedico   | by grobian.                                                |

   | 7661      | Bug #188703 - Don't adjust permissions in ${T} unless      |
   | zmedico   | userpriv is enabled.                                       |

   | 7663      | Pass complete package metadata from depgraph.select_dep()  |
   | zmedico   | into create() in order to minimize aux_get calls.          |

   | 7664      | Make best() return early when it's only given one          |
   | zmedico   | packages.                                                  |

   | 7665      | Fix update_dbentry() to process version components         |
   | zmedico   | properly before passing them into ververify().             |

   | 7666      | Make depgraph.select_dep() reuse cached metadata from      |
   | zmedico   | nodes that have already been added to the graph.           |

   | 7671      | Skip --newuse checks for nodes that have already been      |
   | zmedico   | added to the graph as "merge" nodes.                       |

   | 7672      | Prevent output from being flushed to the console too       |
   | zmedico   | frequently in dir_get_metadata().                          |

   | 7674      | Use INFORM to colorize the package name.                   |
   | zmedico   |                                                            |

   | 7676      | Fix a typo from r7663.                                     |
   | zmedico   |                                                            |

   | 7678      | Bug #189791 - Send errors to /dev/null when debug-print()  |
   | zmedico   | fails to write to ${T}/eclass-debug.log.                   |

   | 7680      | Make depgraph.create() avoid metadata lookups for binary   |
   | zmedico   | packages and ebuilds in cases where an installed package   |
   |           | has already been added to the graph. This greatly improves |
   |           | performance when the graph contains a large number of      |
   |           | installed packages.                                        |

   | 7682      | In config.regenerate(), skip loading /etc/profile.env if   |
   | zmedico   | it's mtime hasn't changed.                                 |

   | 7684      | Bug #189791 - Define EBUILD_PHASE=unpack during the        |
   | zmedico   | nofetch phase since otherwise we get EBUILD_PHASE=merge    |
   |           | which isn't in our list of valid EBUILD_PHASES recognized  |
   |           | by elog.                                                   |

   | 7686      | Make depgraph.select_dep() node reuse work when in         |
   | zmedico   | --usepkgonly mode.                                         |

   | 7688      | Add * and ~* to the list of valid values for               |
   | zmedico   | ACCEPT_KEYWORDS.                                           |

   | 7690      | Fix a typo.                                                |
   | zmedico   |                                                            |

   | 7691      | Fix another typo.                                          |
   | zmedico   |                                                            |

   | 7692      | Use a config.reload() method to explicitly reload          |
   | zmedico   | /etc/profile.env when setting up the ebuild environment.   |

   | 7693      | Call config.regenerate() after config.reload() so that the |
   | zmedico   | incrementals are restacked.                                |

   | 7694      | Don't cache results from match_from_list() since           |
   | zmedico   | *dbapi.match() caches do the job.                          |

   | 7695      | Remove pointless information from --info output            |
   | genone    |                                                            |

svn path=/main/branches/prefix/; revision=7698

Fix up svnlogmsg.awk such that it generates only the log entries for the
revisions that svn merge merged. Bleh.

svn path=/main/branches/prefix/; revision=7697

   Merged from trunk 7586:7593

   | 7587    | Don't generate a QA Notice if the ${S} directory doesn't     |
   | zmedico | exist since it might be irrelevant for some ebuilds.         |

   | 7589    | Optimize config.setcpv() so that it doesn't call             |
   | zmedico | regenerate() unnecessarily when there are no USE wildcards   |
   |         | to expand.                                                   |

   | 7591    | For bug #188559, invalidate dblink._contents_inodes as       |
   | zmedico | necessary to prevent FEATURES=unmerge-orphans from unmerging |
   |         | anything that belongs to the package that has just been      |
   |         | merged.                                                      |

   | 7593    | For bug #33585, leave the old info dir file in place if      |
   | zmedico | there is nothing to generate.                                |

svn path=/main/branches/prefix/; revision=7595

Fix portage creating multiple levels of prefixes. PRIVATE_PATH etc are
already prefixed, so don't prefix them again.

svn path=/main/branches/prefix/; revision=7586

add missing source statement (vimdiffed with trunk)

svn path=/main/branches/prefix/; revision=7566

Remove stupid hack to trigger --metadata after sync. Now I'm older I
understand that this is useless, since we don't have metadata cache in
the SVN tree (and neither will we have as this won't work due to
mtime+svn problems).

svn path=/main/branches/prefix/; revision=7563

Let's have something to read in README

svn path=/main/branches/prefix/; revision=7562

set Id keyword expansion

svn path=/main/branches/prefix/; revision=7561

Avoid double slashes.

svn path=/main/branches/prefix/; revision=7560

Remove the horizontal lines from the table output on request of leio,
such that the commit message looks a bit better/less annoying on #-commits.

svn path=/main/branches/prefix/; revision=7559

vimdiff against trunk

svn path=/main/branches/prefix/; revision=7552

   Merged from trunk 7534:7550

   +------------------------------------------------------------------------+
   | 7535    | For bug #187375, handle an ImportError when portage is       |
   | zmedico | downgraded to a version without mod_echo.                    |
   |---------+--------------------------------------------------------------|
   | 7537    | Like older versions of portage, don't show the repo display  |
   | zmedico | if [0] is all that will be shown.                            |
   |---------+--------------------------------------------------------------|
   | 7541    | For bug #187480, fix writemsg args in portdbapi.gvisible().  |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7544    | For bug #187518, handle EISDIR thrown from mkdir when the    |
   | zmedico | directory already exists on FreeBSD.                         |
   |---------+--------------------------------------------------------------|
   | 7547    | s/portage.eclass_cache/eclass_cache/ since eclass_cache is   |
   | zmedico | actually a local variable here.                              |
   |---------+--------------------------------------------------------------|
   | 7548    | In portage.spawn() logging, put the read end of the pipe in  |
   | zmedico | O_NONBLOCK mode just once at the beginning. This avoids      |
   |         | unnecessary fcntl calls and removes one more opportunity to  |
   |         | trigger EAGAIN errors on FreeBSD.                            |
   |---------+--------------------------------------------------------------|
   | 7550    | Generate a QA Notice and cd to ${WORKDIR} if the ${S}        |
   | zmedico | directory does not exist.                                    |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7551

   Merged from trunk 7521:7528

   +------------------------------------------------------------------------+
   | 7522    | Make finalize() accept a parameter once again since older    |
   | zmedico | versions of portage import elog modules from newer versions  |
   |         | of portage when they upgrade themselves.                     |
   |---------+--------------------------------------------------------------|
   | 7524    | For bug #187142, properly pass a dbapi instance into         |
   | zmedico | setcpv() so that USE_EXPAND wildcards work correctly.        |
   |---------+--------------------------------------------------------------|
   | 7526    | As a workaround for bug #185305, make quickpkg break         |
   | zmedico | hardlinks during creation of the archive.                    |
   |---------+--------------------------------------------------------------|
   | 7528    | Change the numeric value of DepPriority.MIN to be equal to   |
   | zmedico | that of a satisfied PDEPEND since there is currently nothing |
   |         | with lower priority.                                         |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7533

   Merged from trunk 7429:7516

   +------------------------------------------------------------------------+
   | 7430    | For bug #137483, move the `emerge --help config` docs to the |
   | zmedico | emerge man page. Thanks to Arfrever Frehtes Taifersar        |
   |         | Arahesis for this patch.                                     |
   |---------+--------------------------------------------------------------|
   | 7432    | For bug #139670, update the dohtml docs to show all          |
   | zmedico | supported file extensions. Thanks to Arfrever Frehtes        |
   |         | Taifersar Arahesis for this patch.                           |
   |---------+--------------------------------------------------------------|
   | 7496    | Always pass a dbapi instance into a setcpv call.             |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7516    | For bug #186960, try to create a directory for $ROOT if it   |
   | zmedico | doesn't exist.                                               |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7521

   Merged from trunk 7399:7428

   +------------------------------------------------------------------------+
   | 7400    | When setting the size of the pty for logging, check if       |
   | zmedico | stdout isatty rather than stdin.                             |
   |---------+--------------------------------------------------------------|
   | 7402    | For bug #186610, use `find ` to scan for config updates      |
   | zmedico | since `cd ` could fail and cause the cwd to be scanned.      |
   |---------+--------------------------------------------------------------|
   | 7405    | For --buildpkgonly, say "built" instead of "merged" in the   |
   | zmedico | "These are the packages that would be " message.             |
   |---------+--------------------------------------------------------------|
   | 7407    | For bug #186826, always show --newuse flags that trigger     |
   | zmedico | reinstallation even when not in --verbose mode.              |
   |---------+--------------------------------------------------------------|
   | 7410    | For bug #186480, while we transition to repository labels,   |
   | zmedico | avoid ? spam in the repository display by ignoring a missing |
   |         | repository label for an installed package. (branches/2.1.2   |
   |         | r7409)                                                       |
   |---------+--------------------------------------------------------------|
   | 7411    | For bug #186639, add more clarification about the            |
   | zmedico | relationship between /etc/make.profile/ and                  |
   |         | /etc/portage/profile/.                                       |
   |---------+--------------------------------------------------------------|
   | 7413    | For bug #186639, note that /etc/portage/profile/ supports    |
   | zmedico | all of the same file types that /etc/make.profile/ does,     |
   |         | except parent.                                               |
   |---------+--------------------------------------------------------------|
   | 7415    | For bug #185048, make emerge-webrsync honor http_proxy and   |
   | zmedico | ftp_proxy from make.conf.                                    |
   |---------+--------------------------------------------------------------|
   | 7417    | Handle 2 more cases where elog_process() needs to be called: |
   | zmedico | - binary install via pkgmerge() fails before reaching the    |
   |         | merge phase (pkg_setup dies) - doebuild() is called for the  |
   |         | merge phase but it dies before reaching the merge phase      |
   |---------+--------------------------------------------------------------|
   | 7419    | When the fetch phase fails inside doebuild(), create an      |
   | zmedico | eerror log since the mod_echo module might push the original |
   |         | message off of the top of the terminal and prevent the user  |
   |         | from being able to see it.                                   |
   |---------+--------------------------------------------------------------|
   | 7422    | For bug #186876, fall back it os.pipe() if pty.openpty()     |
   | zmedico | fails.                                                       |
   |---------+--------------------------------------------------------------|
   | 7424    | For pty logging, handle the EAGAIN error that is thrown from |
   | zmedico | fcntl when the slave end of the pty is closed on FreeBSD.    |
   |---------+--------------------------------------------------------------|
   | 7426    | Change "output" import to portage.output.                    |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7427    | For bug #187016, and env.d to the default USE_ORDER.         |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7428    | Update USE_ORDER docs for bug #187016.                       |
   | zmedico |                                                              |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7520

Prepend EPREFIX to relative paths, but keep them relative by stripping
the leading '/'.

Cleaned up path construction from root + EPREFIX to avoid double path
separators.

svn path=/main/branches/prefix/; revision=7399

   Merged from trunk 7372:7396

   +------------------------------------------------------------------------+
   | 7373      | Drop privileges in the "depend" phase regardless of        |
   | zmedico   | FEATURES and RESTRICT since that phase should never need   |
   |           | special privileges. Thanks to swegener for the initial     |
   |           | patch.                                                     |
   |-----------+------------------------------------------------------------|
   | 7375      | Enable FEATURES=userfetch by default.                      |
   | zmedico   |                                                            |
   |-----------+------------------------------------------------------------|
   | 7377      | Add sfperms and strict to the default FEATURES since       |
   | zmedico   | they're already in the base profile's make.defaults.       |
   |-----------+------------------------------------------------------------|
   | 7379      | Add FEATURES=fakeroot support which causes install and     |
   | zmedico   | package phases to run inside fakeroot when a non-root user |
   |           | runs the ebuild command. Thanks to swegener for the        |
   |           | initial patch.                                             |
   |-----------+------------------------------------------------------------|
   | 7381      | For bug #186337, show an ewarn message if                  |
   | zmedico   | FEATURES=installsources is enabled but debugedit is not    |
   |           | installed. Also document installsources and splitdebug in  |
   |           | make.conf.example.                                         |
   |-----------+------------------------------------------------------------|
   | 7383      | Fix make.conf.example rejects.                             |
   | zmedico   |                                                            |
   |-----------+------------------------------------------------------------|
   | 7385      | Add droppriv keyword for the depend phase.                 |
   | zmedico   |                                                            |
   |-----------+------------------------------------------------------------|
   | 7387      | Add droppriv keyword for the depend phase (last one).      |
   | zmedico   |                                                            |
   |-----------+------------------------------------------------------------|
   | 7389      | Use a select loop for moving input and ouput when logging  |
   | zmedico   | is enabled in portage.spawn().                             |
   |-----------+------------------------------------------------------------|
   | 7390      | Use the hardcoded variables from portage.const rather than |
   | WarnerBro | strings that are apt to change, fix spacing.               |
   |-----------+------------------------------------------------------------|
   | 7391      | Use blocking mode for writes since we'd rather block than  |
   | zmedico   | trigger a EWOULDBLOCK error.                               |
   |-----------+------------------------------------------------------------|
   | 7392      | CACHE_PATH starts with / and therefore isn't compatible    |
   | zmedico   | with os.path.join().                                       |
   |-----------+------------------------------------------------------------|
   | 7393      | Set O_NONBLOCK just for read calls (uses fewer fcntl       |
   | zmedico   | calls).                                                    |
   |-----------+------------------------------------------------------------|
   | 7394      | For bug #186386, pass stdin directly to spawned processes  |
   | zmedico   | (even when their output goes through a pty) so that Ctrl+Z |
   |           | works as on would expect.)                                 |
   |-----------+------------------------------------------------------------|
   | 7396      | use ${MAKE:-make} rather than make in einstall()           |
   | SpankMan  |                                                            |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7398

Sync with trunk.
VDB_PATH and PRIVATE_PATH are relative, not absolute!

svn path=/main/branches/prefix/; revision=7397

   Merged from trunk 7353:7371

   +------------------------------------------------------------------------+
   | 7354      | Run pychecker over everything, fix obvious thing slike     |
   | WarnerBro | modules not in use, variables not being used, or global    |
   |           | exceptions not being deleted. Also fix imports for style   |
   |           | (1 per line)                                               |
   |-----------+------------------------------------------------------------|
   | 7355      | remove unused vars from xpak, fix bug in compose. Also fix |
   | WarnerBro | tests for portage sets, fix misnamed variable.             |
   |-----------+------------------------------------------------------------|
   | 7356      | Add notes about import statements (clarity) and fix        |
   | WarnerBro | spelling error in release-notes                            |
   |-----------+------------------------------------------------------------|
   | 7357      | Fix spacing issues, imports                                |
   | WarnerBro |                                                            |
   |-----------+------------------------------------------------------------|
   | 7358      | For bug #184774, put lha's -q option last since otherwise  |
   | zmedico   | the option parser now requires level 0, 1, or 2 to be      |
   |           | specified.                                                 |
   |-----------+------------------------------------------------------------|
   | 7360      | add test for CommandOutputSet                              |
   | WarnerBro |                                                            |
   |-----------+------------------------------------------------------------|
   | 7361      | add docstring, fix up imports (style), add keyword         |
   | WarnerBro | expansion                                                  |
   |-----------+------------------------------------------------------------|
   | 7362      | fix missing import, default value for value in case we try |
   | WarnerBro | to .join on a variable that hasn't been assigned to yet    |
   |-----------+------------------------------------------------------------|
   | 7363      | Fix hardcoded /usr/bin/echo to use                         |
   | zmedico   | portage.process.find_binary().                             |
   |-----------+------------------------------------------------------------|
   | 7364      | fix spacing, comments, default args                        |
   | WarnerBro |                                                            |
   |-----------+------------------------------------------------------------|
   | 7365      | Move common file functionality into a FileLoader class and |
   | WarnerBro | delegate parsing to subclasses via a lineParser func, no   |
   |           | idea how this will work performance wise. Fix errors in    |
   |           | parser (blank lines are not errors ;))                     |
   |-----------+------------------------------------------------------------|
   | 7366      | Move classes out of __init__.py, they do not belong there. |
   | WarnerBro | Fix import style, and import statements broken by class    |
   |           | moves.                                                     |
   |-----------+------------------------------------------------------------|
   | 7367      | Fix imports for style, deprecate grab*, what is            |
   | WarnerBro | foo.metadata and what does it contain                      |
   |-----------+------------------------------------------------------------|
   | 7368      | Validator should be a function, not a class, fix           |
   | WarnerBro | spacing/tab issues. Fix parsing errors for                 |
   |           | KeyValuePairLoader. Add a GenericFileLoader class that     |
   |           | uses more than 1 loader in a vain attempt to figure out    |
   |           | what kind of file it is. Fix inheritance by renaming       |
   |           | UserConfigKlass                                            |
   |-----------+------------------------------------------------------------|
   | 7369      | Fix imports for style, slight optimization for grab*       |
   | WarnerBro | function, doc fixups.                                      |
   |-----------+------------------------------------------------------------|
   | 7370      | fix broken import                                          |
   | WarnerBro |                                                            |
   |-----------+------------------------------------------------------------|
   | 7371      | add more tests for keyvaluepairloader (it had a bug        |
   | WarnerBro | previously) and fix up other misc tests                    |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7372

   Merged from trunk 7342:7351

   +------------------------------------------------------------------------+
   | 7343    | Make --prune pull in the system set since that could pull in |
   | zmedico | some slots that wouldn't be pulled in otherwise.             |
   |---------+--------------------------------------------------------------|
   | 7344    | Prevent a potential KeyError when removing world from the    |
   | zmedico | digraph for --prune display.                                 |
   |---------+--------------------------------------------------------------|
   | 7345    | Document --depclean and --prune enhancements.                |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7349    | Make --update imply --oneshot since people often us it to    |
   | zmedico | update things when they don't want to add them to world.     |
   |         | Thanks to jakub for the suggestion.                          |
   |---------+--------------------------------------------------------------|
   | 7351    | Fix the reverse dependency display for --prune when there is |
   | zmedico | now real parent.                                             |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7353

   Merged from trunk 7307:7340

   +------------------------------------------------------------------------+
   | 7308    | With --prune and --depclean, if --verbose is enabled then    |
   | zmedico | show reverse dependencies for each package that is matched   |
   |         | by an atom from the command line. This allows the user to    |
   |         | see why a package will not be unmerged.                      |
   |---------+--------------------------------------------------------------|
   | 7309    | Make --prune bail out like depclean does if there are        |
   | zmedico | unresolved dependencies. Notify the user that they can use   |
   |         | --nodeps in that case.                                       |
   |---------+--------------------------------------------------------------|
   | 7310    | Make --prune try to prune all slotted packages if no atoms   |
   | zmedico | are given (that's how it already works with --nodeps).       |
   |---------+--------------------------------------------------------------|
   | 7312    | For bug #151653, make --prune keep the highest version       |
   | zmedico | whenever possible (even when there is one with a higher      |
   |         | counter installed).                                          |
   |---------+--------------------------------------------------------------|
   | 7313    | Fix --prune so that it always correctly accounts for COUNTER |
   | zmedico | when dealing with packages in the same slot.                 |
   |---------+--------------------------------------------------------------|
   | 7315    | Update --prune docs for bug #151653.                         |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7317    | Document --prune and --depclean enhancements.                |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7319    | For bug #185504, document profiles/repo_name.                |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7321    | If the fetcher reported success and the file is too small,   |
   | zmedico | don't attempt to resume. Upstream probably changed the       |
   |         | distfile and we need to show a digest verification failure   |
   |         | so the user gets a clue.                                     |
   |---------+--------------------------------------------------------------|
   | 7325    | When digest verification of a distfile fails, rename instead |
   | zmedico | of unlinking it in case it's a large download and the user   |
   |         | wants to salvage it due to a bad digest.                     |
   |---------+--------------------------------------------------------------|
   | 7327    | Hint about --nodeps if --prune doesn't find anything to      |
   | zmedico | prune. Also enable reverse dependency display for global     |
   |         | depclean.                                                    |
   |---------+--------------------------------------------------------------|
   | 7329    | Optimize PackageSet._updateAtomMap() for the case where one  |
   | zmedico | or more atoms are added and none are removed.                |
   |---------+--------------------------------------------------------------|
   | 7330    | For bug #185930, direct all FETCHCOMMAND output to stdout.   |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7332    | Just show [0] instead of [0=>0] in the repo display.         |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7334    | Prune really uses all installed instead of world. It's not a |
   | zmedico | real reverse dependency so don't display it as such.         |
   |---------+--------------------------------------------------------------|
   | 7336    | Make --prune and --depclean return before calculating        |
   | zmedico | dependencies if atoms are given but they don't match any     |
   |         | packages.                                                    |
   |---------+--------------------------------------------------------------|
   | 7338    | For bug #185153, in commit mode do the "Fetching trivial     |
   | zmedico | updates" routine before the qa scan.                         |
   |---------+--------------------------------------------------------------|
   | 7340    | For bug #169500, detect when the cvs server puts /Attic/     |
   | zmedico | inside the $Header path and automatically correct it.        |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7342

Give more information that might help to identify the culprit.

svn path=/main/branches/prefix/; revision=7324

Remove typically Vim-typo.

svn path=/main/branches/prefix/; revision=7323

   Merged from trunk 7284:7306

   +------------------------------------------------------------------------+
   | 7285    | Sort the atoms when writing the world file.                  |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7286    | Always be sure to load the latest version of the world file  |
   | zmedico | while it's locked.                                           |
   |---------+--------------------------------------------------------------|
   | 7287    | Revert PackageSet.containsCPV() calls back to                |
   | zmedico | findAtomForPackage() calls so that things like slot atoms    |
   |         | and old-style virtuals are properly supported.               |
   |---------+--------------------------------------------------------------|
   | 7288    | Make sure PackageSet._atoms is always a set.                 |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7289    | Make sure the atoms are loaded when calling                  |
   | zmedico | PackageSet.findAtomForPackage().                             |
   |---------+--------------------------------------------------------------|
   | 7290    | Don't show the repo display when the package list is empty.  |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7292    | When dep_expand throws a ValueError due to an ambiguous      |
   | zmedico | atom, try to expand it against the installed packages in     |
   |         | case it yields a unique match.                               |
   |---------+--------------------------------------------------------------|
   | 7294    | When expanding ambiguous atoms against the vardb, make sure  |
   | zmedico | the the expanded package is also available in the portage    |
   |         | tree.                                                        |
   |---------+--------------------------------------------------------------|
   | 7296    | For bug #185670, make sure package.use.{mask,force} are      |
   | zmedico | properly displayed.                                          |
   |---------+--------------------------------------------------------------|
   | 7298    | Unify USE handling in the depgraph with the other metadata.  |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7300    | Use PF in dyn_package. Thanks to swegener.                   |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7301    | Make PackageSet._updateAtomMap() clear the map in case       |
   | zmedico | something was removed.                                       |
   |---------+--------------------------------------------------------------|
   | 7302    | Use PackageSet.getAtoms() as a wrapper around load() since   |
   | zmedico | load() can trigger unnecessary stat calls.                   |
   |---------+--------------------------------------------------------------|
   | 7303    | Iterate over a list in order to avoid breaking the iterator  |
   | zmedico | when an atom is removed.                                     |
   |---------+--------------------------------------------------------------|
   | 7305    | Use the --depclean algorithm to make --prune safe. The old   |
   | zmedico | unsafe --prune will be used if the --nodeps option is        |
   |         | specified.                                                   |
   |---------+--------------------------------------------------------------|
   | 7306    | Allow atoms to be specified for --depclean so that it can be |
   | zmedico | used to safely unmerge packages if nothing depends on them.  |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7307

   Merged from trunk 7269:7283

   +------------------------------------------------------------------------+
   | 7270   | sync MAILSUBJECT in make.conf with make.globals               |
   | genone |                                                               |
   |--------+---------------------------------------------------------------|
   | 7271   | s/node/atom/ and other minor updates                          |
   | genone |                                                               |
   |--------+---------------------------------------------------------------|
   | 7272   | Make PackageSet to behave more like a real set, and change    |
   | genone | loading logic a bit to avoid unnecessary reloads for editable |
   |        | sets                                                          |
   |--------+---------------------------------------------------------------|
   | 7273   | use a more logical approach for editable sets                 |
   | genone |                                                               |
   |--------+---------------------------------------------------------------|
   | 7274   | fix load logic for editable sets once more                    |
   | genone |                                                               |
   |--------+---------------------------------------------------------------|
   | 7275   | ignore already applied glsas when loading the security set    |
   | genone |                                                               |
   |--------+---------------------------------------------------------------|
   | 7276   | add support for metadata                                      |
   | genone |                                                               |
   |--------+---------------------------------------------------------------|
   | 7277   | fix metadata parsing for file-based sets, add support for     |
   | genone | user-defined file sets in test code                           |
   |--------+---------------------------------------------------------------|
   | 7278   | disable FEATURES=gpg as it's unmaintained, useless and likely |
   | genone | broken for many people                                        |
   |--------+---------------------------------------------------------------|
   | 7279   | replace emerge.AtomSet with portage.sets.InternalPackageSet   |
   | genone |                                                               |
   |--------+---------------------------------------------------------------|
   | 7280   | break recursion cycle                                         |
   | genone |                                                               |
   |--------+---------------------------------------------------------------|
   | 7281   | Replace emerge.SystemSet with                                 |
   | genone | portage.sets.profiles.PackagesSystemSet                       |
   |--------+---------------------------------------------------------------|
   | 7282   | break another recursion cycle, add special subclass for       |
   | genone | "world" to handle locking                                     |
   |--------+---------------------------------------------------------------|
   | 7283   | Replace emerge.WorldSet with portage.sets.files.WorldSet      |
   | genone |                                                               |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7284

   Merged from trunk 7253:7267

   +------------------------------------------------------------------------+
   | 7254     | For bug #185278, make the verbose flag display show         |
   | zmedico  | masked/forced flag status for binary packages too.          |
   |----------+-------------------------------------------------------------|
   | 7256     | Make the repo display work for overlays that don't define   |
   | zmedico  | repo_name (like it used to).                                |
   |----------+-------------------------------------------------------------|
   | 7257     | Always show PORTDIR with index 0 in the repo display.       |
   | zmedico  |                                                             |
   |----------+-------------------------------------------------------------|
   | 7258     | Encapsulate the repo display code in a class.               |
   | zmedico  |                                                             |
   |----------+-------------------------------------------------------------|
   | 7259     | Use sys.stdout instead of print to avoid an extra newline.  |
   | zmedico  |                                                             |
   |----------+-------------------------------------------------------------|
   | 7260     | Remove unused repo_name code.                               |
   | zmedico  |                                                             |
   |----------+-------------------------------------------------------------|
   | 7263     | When deciding if a package is slotted inside                |
   | zmedico  | create_world_atom(), check the vdb in case the package is   |
   |          | multislot.                                                  |
   |----------+-------------------------------------------------------------|
   | 7265     | Fix typo.                                                   |
   | zmedico  |                                                             |
   |----------+-------------------------------------------------------------|
   | 7267     | split up the debug/sources steps as proposed by swegener    |
   | SpankMan | and give the whole file a cleanup                           |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7268

   Merged from trunk 7246:7251

   +------------------------------------------------------------------------+
   | 7247    | Save the repo name along with the other metadata inside      |
   | zmedico | dyn_compile() so that it's saved inside binary packages for  |
   |         | when they are finally merged.                                |
   |---------+--------------------------------------------------------------|
   | 7249    | Misc fixes for verbose repo output: - Support binary         |
   | zmedico | packages by using the 'repository' metadata that's stored in |
   |         | the package. - Support PORTAGE_CONFIGROOT, showing repos     |
   |         | from both configs if necessary. - Dynamic allocation of repo |
   |         | indexes so only relevant repos are shown.                    |
   |---------+--------------------------------------------------------------|
   | 7250    | Fix it so that the 'repository could not be determined'      |
   | zmedico | message is shown when appropriate (issue with variable       |
   |         | scope).                                                      |
   |---------+--------------------------------------------------------------|
   | 7251    | PDEPEND is now installed as soon as possible so that it      |
   | zmedico | behaves more like RDEPEND.                                   |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7253

Fix problem that for now only I encountered as in
http://article.gmane.org/gmane.linux.gentoo.alt/2778

dbapi.getRepositoryPath returns an os.path.realpath-ified path of the
repository, which means in case of symlinks (my case) this is different
from what the PORTDIR variable gives. So before comparing,
os.path.realpath-ify the PORTDIR too.

svn path=/main/branches/prefix/; revision=7245

   Merged from trunk 7209:7242

   +------------------------------------------------------------------------+
   | 7210    | - remove readable bits for debug files if the souce ELF is   |
   | solar   | setXid                                                       |
   |---------+--------------------------------------------------------------|
   | 7211    | - be quiet about overlays profiles/repo_name entry when      |
   | solar   | --quiet mode is used                                         |
   |---------+--------------------------------------------------------------|
   | 7212    | Remove the repo_name warning in the portdbapi constructor    |
   | zmedico | since we don't want to see a warning every time the portage  |
   |         | module is imported.                                          |
   |---------+--------------------------------------------------------------|
   | 7214    | For bug #184806, account for the fact the metadata is not    |
   | zmedico | cached for slot_collision_nodes.                             |
   |---------+--------------------------------------------------------------|
   | 7216    | For bug #184604, make env-update write $ in front of quoted  |
   | zmedico | values when appropriate.                                     |
   |---------+--------------------------------------------------------------|
   | 7218    | For bug #184843, allow USE_EXPAND variables to pass through  |
   | zmedico | if none of their flags are in IUSE. This allows packages     |
   |         | that support LINGUAS but don't declare it in IUSE to use the |
   |         | variable outside of the USE_EXPAND context.                  |
   |---------+--------------------------------------------------------------|
   | 7220    | For bug #184679, handle ENOTDIR by finding the non-directory |
   | zmedico | parent and testing that for collision instead.               |
   |---------+--------------------------------------------------------------|
   | 7222    | For bug #184687, skip the huge --depclean warning when       |
   | zmedico | --quiet mode is enabled.                                     |
   |---------+--------------------------------------------------------------|
   | 7224    | Fix typo.                                                    |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7226    | Fix another case similar to bug #184806 that can occur with  |
   | zmedico | --onlydeps.                                                  |
   |---------+--------------------------------------------------------------|
   | 7228    | Fix typo.                                                    |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7230    | Use set.discard() instead of remove() to avoid a potential   |
   | zmedico | KeyError.                                                    |
   |---------+--------------------------------------------------------------|
   | 7237    | For bug #184983, prevent USE_EXPAND_HIDDEN flags from being  |
   | zmedico | hidden if they are the only thing that triggered             |
   |         | reinstallation.                                              |
   |---------+--------------------------------------------------------------|
   | 7239    | Make depgraph._reinstall_for_flags() always return all       |
   | zmedico | revelant flags.                                              |
   |---------+--------------------------------------------------------------|
   | 7241    | Fix the case where the currently installed package is from a |
   | zmedico | repo that is no longer in the overlay (oldrepo is None       |
   |         | rather than an empty string).                                |
   |---------+--------------------------------------------------------------|
   | 7242    | Add "reset" to the list of attributes.                       |
   | zmedico |                                                              |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7244

   Merged from trunk 7163:7207

   +------------------------------------------------------------------------+
   | 7164     | Don't store unslotted system packages in the world file.    |
   | zmedico  |                                                             |
   |----------+-------------------------------------------------------------|
   | 7166     | Fix emerge by ebuild path so that it works properly.        |
   | zmedico  |                                                             |
   |----------+-------------------------------------------------------------|
   | 7168     | add modified copy of gentoolkits glsa.py (r410)             |
   | genone   |                                                             |
   |----------+-------------------------------------------------------------|
   | 7169     | Enable keyword expansion                                    |
   | genone   |                                                             |
   |----------+-------------------------------------------------------------|
   | 7170     | Add first draft of PackageSet backend modules               |
   | genone   |                                                             |
   |----------+-------------------------------------------------------------|
   | 7171     | Fix emerge by tbz2 path so that it works properly.          |
   | zmedico  |                                                             |
   |----------+-------------------------------------------------------------|
   | 7172     | fix copyright year                                          |
   | genone   |                                                             |
   |----------+-------------------------------------------------------------|
   | 7174     | Remove the PKG_*ARG* color classes in order to simplify     |
   | zmedico  | things since it's questionable whether many people will     |
   |          | want to use them. Also, make the PKG_*SYSTEM colors default |
   |          | to the traditional colors since people are generally most   |
   |          | interested in world packages.                               |
   |----------+-------------------------------------------------------------|
   | 7176     | ignore generated docs                                       |
   | SpankMan |                                                             |
   |----------+-------------------------------------------------------------|
   | 7177     | tighten up --quiet output for --unmerge                     |
   | SpankMan |                                                             |
   |----------+-------------------------------------------------------------|
   | 7178     | Count the number of merges processed by MergeTask and use   |
   | zmedico  | that to determine whether or not post_merge() should run.   |
   |----------+-------------------------------------------------------------|
   | 7180     | Don't exclude system virtuals from world since they can     |
   | zmedico  | match multiple old-style virtuals but only one of them will |
   |          | be pulled in by update or depclean.                         |
   |----------+-------------------------------------------------------------|
   | 7183     | Misc color fixes. Thanks to Arfrever Frehtes Taifersar      |
   | zmedico  | Arahesis <Arfrever.FTA@GMail.Com> for this patch from       |
   |          | bug#183861, comment #9.                                     |
   |----------+-------------------------------------------------------------|
   | 7185     | When depgraph updates preferences for old-style virtuals,   |
   | zmedico  | also update them in the global config so that they are      |
   |          | consistent everywhere. Optimize config.setinst() to         |
   |          | minimize the work done.                                     |
   |----------+-------------------------------------------------------------|
   | 7187     | Add a depgaph.loadResumeCommand() method to handle loading  |
   | zmedico  | and validation of all resume data.                          |
   |----------+-------------------------------------------------------------|
   | 7189     | `find` can accept a list of paths so condense this nested   |
   | SpankMan | for loop, and dont split off debug information for ET_REL   |
   |          | files as these are never pulled in via debug utilities (and |
   |          | can trigger weird behavior in binutils when linked into     |
   |          | things, like glibcs crt1.o)                                 |
   |----------+-------------------------------------------------------------|
   | 7191     | Now that the "white" color code really is white, alias it   |
   | zmedico  | to bold where it's used by emerge since white looks bad on  |
   |          | a terminal with a white background.                         |
   |----------+-------------------------------------------------------------|
   | 7193     | allow split debuf for kernel modules                        |
   | SpankMan |                                                             |
   |----------+-------------------------------------------------------------|
   | 7195     | For bug #184412, make depclean more consistent with the     |
   | zmedico  | update algorithm by keeping the highest version that as     |
   |          | visible in the portage tree and pruning any versions that   |
   |          | are either masked or no longer exist in the portage tree.   |
   |----------+-------------------------------------------------------------|
   | 7197     | Allow system virtuals to be pruned from the world file in   |
   | zmedico  | cases where the matched package is the only provider of     |
   |          | that virtual.                                               |
   |----------+-------------------------------------------------------------|
   | 7199     | Add color classes PROMPT_CHOICE_{DEFAULT,OTHER} for         |
   | zmedico  | emerge's Yes/No prompt.                                     |
   |----------+-------------------------------------------------------------|
   | 7201     | For bug #184566, enable the emerge --info action to run an  |
   | zmedico  | option pkg_info() function from each installed ebuild.      |
   |----------+-------------------------------------------------------------|
   | 7203     | Make dblink invalidate the vardbapi caches for each merge   |
   | zmedico  | and unmerge. Don't use portage.listdir() since mtime        |
   |          | granularity can prevent cachedir from invalidating it's     |
   |          | cache properly and this redundant cache layer isn't needed  |
   |          | anyway. This should solve the intermittent failure of       |
   |          | AUTOCLEAN to properly clean packages.                       |
   |----------+-------------------------------------------------------------|
   | 7204     | Pass the file path into the PermissionDenied exception.     |
   | zmedico  |                                                             |
   |----------+-------------------------------------------------------------|
   | 7206     | simplify logic a bit                                        |
   | genone   |                                                             |
   |----------+-------------------------------------------------------------|
   | 7207     | Fix interaction of resume opts with spinner output handling |
   | zmedico  | so that output always looks correct.                        |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7209

   Merged from trunk 7137:7161

   +------------------------------------------------------------------------+
   | 7138    | In depgraph.select_files(), unify favorites handling with    |
   | zmedico | the other args handling.                                     |
   |---------+--------------------------------------------------------------|
   | 7139    | Fix --oneshot handling from the previous commit.             |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7140    | Use depgraph._args_nodes to simplify                         |
   | zmedico | depgraph.saveNomergeFavorites().                             |
   |---------+--------------------------------------------------------------|
   | 7142    | Record a slot atom in the world file for any atom that is    |
   | zmedico | precise enough to identify a specific slot. Make depclean    |
   |         | clean unnecessary slots of system and world packages. For    |
   |         | update and depclean, world atoms can be greedy with slots    |
   |         | while system atoms can not.                                  |
   |---------+--------------------------------------------------------------|
   | 7144    | Fix greedy atoms logic for system mode.                      |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7146    | For bug #183861, allow a color class in color.map to specify |
   | zmedico | a space separated list of attributes so that any combination |
   |         | of foreground, background, and other attributes is possible. |
   |         | Thanks to Arfrever Frehtes Taifersar Arahesis                |
   |         | <Arfrever.FTA@GMail.Com> for this patch.                     |
   |---------+--------------------------------------------------------------|
   | 7147    | Add a "onerror" callback to parse_color_map() for handling   |
   | zmedico | each ParseError that would otherwise be raised.              |
   |---------+--------------------------------------------------------------|
   | 7148    | Fix broken code concatenation logic in parse_color_map().    |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7149    | Make the color class handling for package sets more          |
   | zmedico | consistent as suggested in comment #2 of bug #183861.        |
   |---------+--------------------------------------------------------------|
   | 7150    | Document the additional color classes for bug #183861.       |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7153    | Replace sys.exit() with return in depgraph.display() and     |
   | zmedico | action_build().                                              |
   |---------+--------------------------------------------------------------|
   | 7155    | Add note about repo name warnings                            |
   | genone  |                                                              |
   |---------+--------------------------------------------------------------|
   | 7157    | Remove fallback imports for set(), and note minimum          |
   | genone  | requirement of python-2.4                                    |
   |---------+--------------------------------------------------------------|
   | 7159    | Remove redundant config update notification (bug #184116)    |
   | genone  |                                                              |
   |---------+--------------------------------------------------------------|
   | 7161    | Move depgraph._args_atoms to depgraph._sets["args"] and move |
   | zmedico | depgraph._args_nodes to self._set_nodes.                     |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7163

   Merged from trunk 7130:7135

   +------------------------------------------------------------------------+
   | 7131    | Clean up system and world set handling. For forward          |
   | zmedico | compatibility, the world file handling now allows the world  |
   |         | file to contain arbitrary atoms such as slot atoms.          |
   |---------+--------------------------------------------------------------|
   | 7132    | Add USE to the list of metadata keys to pull.                |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7133    | Fix broken favorites handling with --usepkg.                 |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7135    | Implement BlockerCache.keys() so that DictMixin.__repr__()   |
   | zmedico | works.                                                       |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7137

Cleaned up configure, removed unnecessary checks (greatly speeds up)
Cleaned up users/groups stuff with configure arguments
Removed python-missingos since we don't work with prehistoric pythons
for ages any more (prehistoric starts at < 2.2.3)

svn path=/main/branches/prefix/; revision=7130

Remove --wheelgid from configure, and wheelgid from const_autotool. The
wheel group isn't really used in portage and superseeded by the portage
group.

svn path=/main/branches/prefix/; revision=7129

   Merged from trunk 7090:7126

   +------------------------------------------------------------------------+
   | 7091    | For bug #183639, give a more informative message with the    |
   | zmedico | package.provided warning.                                    |
   |---------+--------------------------------------------------------------|
   | 7093    | Test for existence of the getRepositories method since       |
   | zmedico | bindbapi doesn't have it atm.                                |
   |---------+--------------------------------------------------------------|
   | 7094    | Add a 0xAAAA00 rgb color code to represent the darkyellow    |
   | zmedico | color that some terminals have instead of brown.             |
   |---------+--------------------------------------------------------------|
   | 7096    | print a notice when a repository/overlay does not have a     |
   | genone  | name                                                         |
   |---------+--------------------------------------------------------------|
   | 7097    | ewarn when merging a package and the source                  |
   | genone  | repository/overlay does not have a name                      |
   |---------+--------------------------------------------------------------|
   | 7098    | apply additional phase filters as otherwise some messages    |
   | genone  | are logged in both unmerge and merge                         |
   |---------+--------------------------------------------------------------|
   | 7099    | Remove old wheel group warnings since portage stopped using  |
   | zmedico | this group long ago.                                         |
   |---------+--------------------------------------------------------------|
   | 7100    | Add docs for /etc/portage/color.map and a few misc man page  |
   | zmedico | fixes. Thanks to Arfrever Frehtes Taifersar Arahesis         |
   |         | <Arfrever.FTA@GMail.Com> in bug #183758.                     |
   |---------+--------------------------------------------------------------|
   | 7102    | Add a QA warning for invalid values of RESTRICT. Thanks to   |
   | zmedico | peper for the patch.                                         |
   |---------+--------------------------------------------------------------|
   | 7104    | For bug #180045, try to merge PDEPEND as soon as possible so |
   | zmedico | that it behaves more like RDEPEND.                           |
   |---------+--------------------------------------------------------------|
   | 7106    | Add medium-soft support to DepPriority.__str__().            |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7108    | Update --buildpkgonly logic to account for                   |
   | zmedico | DepPriority.MEDIUM_SOFT.                                     |
   |---------+--------------------------------------------------------------|
   | 7110    | Revert --buildpkgonly logic back because it was already      |
   | zmedico | correct.                                                     |
   |---------+--------------------------------------------------------------|
   | 7112    | For bug #131030, update the warning about potential for      |
   | zmedico | emerge --sync overwrite or delete files in ${PORTDIR}. Add   |
   |         | references to the PKGDIR and DISTDIR docs.                   |
   |---------+--------------------------------------------------------------|
   | 7114    | s/PORTAGE_EXTRA_RSYNC_OPTS/PORTAGE_RSYNC_OPTS/ for           |
   | zmedico | correctness.                                                 |
   |---------+--------------------------------------------------------------|
   | 7116    | If necessary, resample the leaf nodes so that they include   |
   | zmedico | all nodes whose hard deps are satisfied.                     |
   |---------+--------------------------------------------------------------|
   | 7118    | Move medium priority out of ignore_priority_range and handle |
   | zmedico | it separately.                                               |
   |---------+--------------------------------------------------------------|
   | 7120    | Flatten restrict for the RESTRICT.invalid check.             |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7122    | Clean up the selected_nodes logic in depgraph.altlist().     |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7124    | Clone asap_nodes so that iteration is safe for node removal. |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7126    | Prefer asap_nodes more aggressively over any other nodes     |
   | zmedico | whenever possible. If no asap_nodes can be selected for a    |
   |         | given iteration, they will be ignored for the next           |
   |         | iteration.                                                   |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7128

   Merged from trunk 7086:7089

   +------------------------------------------------------------------------+
   | 7087   | Store name of source repository in vdb node for later         |
   | genone | comparison                                                    |
   |--------+---------------------------------------------------------------|
   | 7088   | Use better parseable format for list_preserved_libs           |
   | genone |                                                               |
   |--------+---------------------------------------------------------------|
   | 7089   | display source repository for installed package and target    |
   | genone | package (bug #67072)                                          |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7090

   Merged from trunk 7080:7083

   +------------------------------------------------------------------------+
   | 7081    | For bug #144333, document the new --reinstall=changed-use    |
   | zmedico | option.                                                      |
   |---------+--------------------------------------------------------------|
   | 7083    | Fix typo.                                                    |
   | zmedico |                                                              |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7085

   Merged from trunk 7054:7078

   +------------------------------------------------------------------------+
   | 7055    | Format $EBUILD_OVERLAY_ECLASSES output more like it was      |
   | zmedico | before.                                                      |
   |---------+--------------------------------------------------------------|
   | 7057    | Fix quoting.                                                 |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7059    | For bug #142473, account for $ROOT when deciding if a        |
   | zmedico | package is part of world or not.                             |
   |---------+--------------------------------------------------------------|
   | 7061    | Instead of just a list, use a cat/pkg dict for matching      |
   | zmedico | packages against args in the depgraph.                       |
   |---------+--------------------------------------------------------------|
   | 7063    | Improve tracking of correspondence between arguments and     |
   | zmedico | packages in the depgraph.                                    |
   |---------+--------------------------------------------------------------|
   | 7064    | Cache aux_get() metadata in depgraph.create() and use        |
   | zmedico | PROVIDE for matching packages to arguments.                  |
   |---------+--------------------------------------------------------------|
   | 7065    | Just use a containment test for matching pprovided args      |
   | zmedico | since it works correctly and match_to_list() isn't           |
   |         | appropriate for this.                                        |
   |---------+--------------------------------------------------------------|
   | 7067    | Discard "nomerge" nodes to speed up depgraph.altlist() since |
   | zmedico | those nodes aren't used and the --tree algorithm does a good |
   |         | job of regenerating them when appropriate.                   |
   |---------+--------------------------------------------------------------|
   | 7069    | For bug #144333, make the --reinstall option a single choice |
   | zmedico | type.                                                        |
   |---------+--------------------------------------------------------------|
   | 7071    | When filling in "nomerge" nodes for --tree display, stop at  |
   | zmedico | a node that is an argument or a direct member of a set that  |
   |         | has been specified as an argument (system or world).         |
   |---------+--------------------------------------------------------------|
   | 7073    | For bug #183431, catch a ParseError caused by a corrupt      |
   | zmedico | profile and dump an error message. This allows emerge to     |
   |         | continue with actions that don't require a valid profile,    |
   |         | such as --sync.                                              |
   |---------+--------------------------------------------------------------|
   | 7075    | For bug #142473, add 2 additional color classes for system   |
   | zmedico | packages and packages matched by arguments.                  |
   |---------+--------------------------------------------------------------|
   | 7076    | Don't colorize system package when in "world" mode.          |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7078    | Remove unused worldlist variable.                            |
   | zmedico |                                                              |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7080

   Merged from trunk 7038:7052

   +------------------------------------------------------------------------+
   | 7039    | Add sanity checks in fetch() and digestgen() to              |
   | zmedico | automatically detect and handle invalid empty distfiles      |
   |         | since some users have reported difficulty when trying to     |
   |         | create digests.                                              |
   |---------+--------------------------------------------------------------|
   | 7041    | Add one more size == 0 check to digestgen().                 |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7042    | Short circuit the loop as soon as missing hashes are         |
   | zmedico | detected.                                                    |
   |---------+--------------------------------------------------------------|
   | 7044    | Short circuit the loop as soon as missing hashes are         |
   | zmedico | detected.                                                    |
   |---------+--------------------------------------------------------------|
   | 7046    | Preserve merge order in elog output.                         |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7047    | Send the ebuild die message through eerror and make sure     |
   | zmedico | that elog_process() gets called when an ebuild dies. This    |
   |         | makes the elog echo module display the die message last in   |
   |         | case other elog messages push the original die message off   |
   |         | of the top of the screen.                                    |
   |---------+--------------------------------------------------------------|
   | 7050    | Format the callstack indentation more like it used to be.    |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7052    | For bug #144333, add a --reinstall=changed-use option which  |
   | zmedico | behaves similar to how --newuse behaved in portage-2.0.x     |
   |         | days.                                                        |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7054

Haven't seen portage meltdowns lately, so we can revert my hack to keep
it going.

svn path=/main/branches/prefix/; revision=7038

Fix up make.conf, as some people really read it and copy over the
examples, which in that case should work.

svn path=/main/branches/prefix/; revision=7037

   Merged from trunk 7033:7034

   +------------------------------------------------------------------------+
   | 7034    | For bug #183167, explicitly call elog_process() when         |
   | zmedico | --buildpkgonly is enabled.                                   |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7036

   Merged from trunk 6995:7031

   +------------------------------------------------------------------------+
   | 6996    | Fix more typos from r6988.                                   |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6999    | For bug #180706, add sorting and a trailing newline in the   |
   | zmedico | rest of the cases where the world file is written.           |
   |---------+--------------------------------------------------------------|
   | 7002    | Fix broken base_uri handling for old-style binhosts in       |
   | zmedico | binarytree.gettbz2().                                        |
   |---------+--------------------------------------------------------------|
   | 7004    | Update the FETCHCOMMAND docs to indicate that the command    |
   | zmedico | should be +written to place the fetched file at              |
   |         | ${DISTDIR}/${FILE}.                                          |
   |---------+--------------------------------------------------------------|
   | 7005    | Clarify RESUMECOMMAND requirements.                          |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7008    | Use a set to optimize containment lookups.                   |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7011    | Remove unused imports and unnecessary dict.keys() call.      |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7012    | Fix binarytree.isremote() to be consistent with              |
   | zmedico | binarytree.gettbz2() logic wrt partially downloaded files.   |
   |---------+--------------------------------------------------------------|
   | 7014    | Clean up file_get() to use shlex, varexpand, and spawn.      |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7016    | For bug #175891, support ${FETCHCOMMAND}_${PROTOCOL} in      |
   | zmedico | binarytree.gettbz2().                                        |
   |---------+--------------------------------------------------------------|
   | 7018    | Fix resume logic in binarytree.gettbz2().                    |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7019    | Fix typo.                                                    |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7023    | For bug #175891, add sftp protocol support via the paramiko  |
   | zmedico | library.                                                     |
   |---------+--------------------------------------------------------------|
   | 7024    | Fix file_get_lib() so it behaves the same way with sftp as   |
   | zmedico | it does with other protocols.                                |
   |---------+--------------------------------------------------------------|
   | 7025    | Allow SystemExit through as usual.                           |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7027    | Don't use urljoin() in binarytree.gettbz2() since it doesn't |
   | zmedico | work correctly wih unrecognized protocols like sftp.         |
   |---------+--------------------------------------------------------------|
   | 7029    | Fix typo.                                                    |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7031    | For bug #142473, add 4 color classes corresponding to        |
   | zmedico | combinations of world/merge/nomerge attributes of each       |
   |         | package.                                                     |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7033

   Merged from trunk 6981:6990

   +------------------------------------------------------------------------+
   | 6982    | Fix check_config_instance() weirdness when the ebuild        |
   | zmedico | command reloads the portage module.                          |
   |---------+--------------------------------------------------------------|
   | 6983    | For bug #182964, replace os.rename() with portage.movefile() |
   | zmedico | in cases where the parent directory might change.            |
   |---------+--------------------------------------------------------------|
   | 6985    | Provide a default value for PORTAGE_BINPKG_TMPFILE in case   |
   | zmedico | the package phase is called by the ebuild command.           |
   |---------+--------------------------------------------------------------|
   | 6986    | Always unlink the .installed flag prior to merge since       |
   | zmedico | portage.movefile() never leaves intact.                      |
   |---------+--------------------------------------------------------------|
   | 6987    | Make the fix for bug #139600 slightly less icky by grabbing  |
   | zmedico | the ACCEPT_KEYWORDS through mysettings.configdict[backupenv] |
   |         | instead of directly through os.environ.                      |
   |---------+--------------------------------------------------------------|
   | 6988    | Fix column alignment in unmerge output.                      |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6989    | Fix typo.                                                    |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6990    | Handle 'Permission denied' errors that can occur if the      |
   | zmedico | current user isn't allowed to access PRIVATE_PATH.           |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=6995

   Merged from trunk 6971:6981

   +------------------------------------------------------------------------+
   | 6972   | add hashlib support for checksum verification, refactor       |
   | genone | checksum functions to not look like a complete mess           |
   |--------+---------------------------------------------------------------|
   | 6973   | Allow sync for unpriviledges users if they have write access  |
   | genone | to $PORTDIR                                                   |
   |--------+---------------------------------------------------------------|
   | 6974   | syntax error                                                  |
   | genone |                                                               |
   |--------+---------------------------------------------------------------|
   | 6975   | s/!owned/replaced/ in merge output to clarify it              |
   | genone |                                                               |
   |--------+---------------------------------------------------------------|
   | 6976   | sort the world file before writing it and ensure that it's    |
   | genone | terminated by a newline                                       |
   |--------+---------------------------------------------------------------|
   | 6977   | change default diff_command for emacs (bug #147558)           |
   | genone |                                                               |
   |--------+---------------------------------------------------------------|
   | 6978   | dont break when the binhost url doesn't end with a slash (bug |
   | genone | #144440)                                                      |
   |--------+---------------------------------------------------------------|
   | 6979   | highlight world packages in --pretend output (bug #142473)    |
   | genone |                                                               |
   |--------+---------------------------------------------------------------|
   | 6980   | Add a pointer from FETCHCOMMAND to RESUMECOMMAND (bug         |
   | genone | #141550)                                                      |
   |--------+---------------------------------------------------------------|
   | 6981   | get ACCEPT_KEYWORDS from the env in gvisible() to properly    |
   | genone | handle negated values (bug #139600)                           |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=6994

   Merged from trunk 6949:6970

   +------------------------------------------------------------------------+
   | 6950    | Update 2.1.3 news for elog stuff.                            |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6952    | Add a note about potential for config mixups in elog         |
   | zmedico | finalizers.                                                  |
   |---------+--------------------------------------------------------------|
   | 6953    | Dump mod_echo elog output inside post_emerge(), just before  |
   | zmedico | the other notifications that happen at exit.                 |
   |---------+--------------------------------------------------------------|
   | 6954    | Document RESTRICT=bindist and add a note about allowance for |
   | zmedico | conditional syntax.                                          |
   |---------+--------------------------------------------------------------|
   | 6955    | Make elog finalize() handling safe for PORTAGE_CONFIGROOT.   |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6956    | Remove confcache docs.                                       |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6959    | Show which $ROOT a package was merged to when $ROOT is not   |
   | zmedico | /.                                                           |
   |---------+--------------------------------------------------------------|
   | 6962    | Add a logrotate config for the save_summary elog module      |
   | zmedico | since it's enabled by default now.                           |
   |---------+--------------------------------------------------------------|
   | 6964    | Remove redundant 'Usage: ' from the usage message.           |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6967    | For bug #182964, replace os.rename() with shutil.move() in   |
   | zmedico | order to handle EXDEV errors that are triggered by layered   |
   |         | filesystems.                                                 |
   |---------+--------------------------------------------------------------|
   | 6969    | s/OSError/EnvironmentError/ since shutil.move() generally    |
   | zmedico | raises an IOError.                                           |
   |---------+--------------------------------------------------------------|
   | 6970    | Revert r6967 since shutil.move() is broken internally.       |
   | zmedico |                                                              |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=6993

To avoid portage meltdowns for now, make it a warning when obj is not an
instance of type. Whatever this means, it appears to happen a lot
during e.g. ebuild .... digest, not sure why (yet).

svn path=/main/branches/prefix/; revision=6992