Fabian Groffen [Sat, 27 Feb 2010 20:02:45 +0000 (20:02 -0000)]
Merged from trunk -r15465:15470
| 15466 | Splid deprecated functions into a _deprecated module. |
| zmedico | |
| 15467 | Fix broken dep_expand import from previous commit. |
| zmedico | |
| 15468 | Move merge and unmerge functions to the vartree module. |
| zmedico | |
| 15469 | Move getvirtuals to _deprecated module. |
| zmedico | |
| 15470 | Eliminate the PhaseCheck constructor and make |
| zmedico | PhaseCheck.phases_re a class attribute. Thanks to Sebastian |
| | Pipping <sping@g.o> for the initial patch. |
svn path=/main/branches/prefix/; revision=15484
Fabian Groffen [Sat, 27 Feb 2010 19:32:48 +0000 (19:32 -0000)]
Merged from trunk -r15460:15465
| 15461 | Move dep.py to dep/__init__.py, for splitting into smaller |
| zmedico | files. |
| 15462 | Move portage.dep_check and related functions to |
| zmedico | portage.dep.dep_check. |
| 15463 | Split getmaskingstatus and getmaskingreason info |
| zmedico | portage.package.ebuild submodules. |
| 15464 | Move portage.movefile to portage.util.movefile. |
| zmedico | |
| 15465 | Avoid name collision with dep_expand submodule so epydoc |
| zmedico | won't crash. |
svn path=/main/branches/prefix/; revision=15483
Fabian Groffen [Sat, 27 Feb 2010 19:26:00 +0000 (19:26 -0000)]
Merged from trunk -r15455:15460
| 15456 | Relocate portage.util.digestgen to |
| zmedico | portage.package.ebuild.digestgen. |
| 15457 | Fix broken digestgen import. |
| zmedico | |
| 15458 | Move portage.digestcheck to |
| zmedico | portage.package.ebuild.digestcheck. |
| 15459 | Fix typo in import. |
| zmedico | |
| 15460 | Move dep_expand and cpv_expand into portage.dbapi |
| zmedico | submodules. |
svn path=/main/branches/prefix/; revision=15482
Fabian Groffen [Sat, 27 Feb 2010 19:21:09 +0000 (19:21 -0000)]
Merged from trunk -r15451:15455
| 15452 | Move env_update to portage.util.env_update.envupdate. |
| zmedico | |
| 15453 | Move ExtractKernelVersion |
| zmedico | portage.util.ExtractKernelVersion. |
| 15454 | Move digestgen to portage.util.digestgen. |
| zmedico | |
| 15455 | Define 'long' for Python 3. |
| arfrever | |
svn path=/main/branches/prefix/; revision=15481
Fabian Groffen [Sat, 27 Feb 2010 19:01:26 +0000 (19:01 -0000)]
Merged from trunk -r15449:15451
| 15450 | Move cacheddir and listdir to portage.util.listdir. |
| zmedico | |
| 15451 | Fix broken references to |
| zmedico | portage._doebuild_manifest_exempt_depend. |
svn path=/main/branches/prefix/; revision=15480
Fabian Groffen [Sat, 27 Feb 2010 18:53:28 +0000 (18:53 -0000)]
resolve all merge conflicts
svn path=/main/branches/prefix/; revision=15479
Fabian Groffen [Sat, 27 Feb 2010 18:30:51 +0000 (18:30 -0000)]
Merged from trunk -r15438:15449
| 15445 | Add missing writmsg import. |
| zmedico | |
| 15446 | Fix a logic error which causes blockers from installed |
| zmedico | packages to be ignored in some cases. Thanks to Brian Dolbec |
| | (dol-sen) for reporting. |
| 15447 | Remove unused 'expandcache' global variable. |
| zmedico | |
| 15448 | Split doebuild and related code to the |
| zmedico | portage.package.ebuild module. |
| 15449 | Make auxdbkeys a tuple instead of a list. |
| zmedico | |
svn path=/main/branches/prefix/; revision=15478
Fabian Groffen [Tue, 23 Feb 2010 19:06:57 +0000 (19:06 -0000)]
revert readlink attempt, needs to support both relative and absolute symlinks, just check if something exists
svn path=/main/branches/prefix/; revision=15444
Fabian Groffen [Tue, 23 Feb 2010 17:31:28 +0000 (17:31 -0000)]
more missing symbols
svn path=/main/branches/prefix/; revision=15443
Fabian Groffen [Tue, 23 Feb 2010 17:25:39 +0000 (17:25 -0000)]
import it correctly, even
svn path=/main/branches/prefix/; revision=15442
Fabian Groffen [Tue, 23 Feb 2010 17:24:54 +0000 (17:24 -0000)]
import missing symbol
svn path=/main/branches/prefix/; revision=15441
Fabian Groffen [Tue, 23 Feb 2010 17:17:09 +0000 (17:17 -0000)]
Merged from trunk -r15436:15438
| 15437 | Add deprecation warnings for unused digestgen() parameters. |
| zmedico | |
| 15438 | Make the first two positional arguments of digestgen() into |
| zmedico | keyword arguments since the first one isn't really needed |
| | (when this code is in stable we can start showing a |
| | deprecation warning when the redundant argument is used). |
svn path=/main/branches/prefix/; revision=15440
Fabian Groffen [Tue, 23 Feb 2010 17:14:10 +0000 (17:14 -0000)]
Resolve merge conflict... CVS at least would have warned about it...
svn path=/main/branches/prefix/; revision=15439
Fabian Groffen [Mon, 22 Feb 2010 19:59:39 +0000 (19:59 -0000)]
add missing leading slash to path component, such that it will match with PATH
svn path=/main/branches/prefix/; revision=15436
Fabian Groffen [Mon, 22 Feb 2010 19:56:18 +0000 (19:56 -0000)]
follow symlinks before doing the executable check, makes stuff like python found (and shebang fixed)
svn path=/main/branches/prefix/; revision=15435
Fabian Groffen [Mon, 22 Feb 2010 13:26:20 +0000 (13:26 -0000)]
Merged from trunk -r15421:15429
| 15422 | Move the portage.util module into a directory, for |
| zmedico | splitting into smaller files. |
| 15423 | Move portage.digraph class to portage.util.digraph.digraph. |
| zmedico | |
| 15424 | Move portage.config class to |
| zmedico | portage.package.ebuild.config.config. |
| 15425 | Move portage.fetch() to |
| zmedico | portage.package.ebuild.fetch.fetch(). |
| 15426 | Use lazy import for portage.Manifest. |
| zmedico | |
| 15427 | Enable --rebuilt-binaries automatically only when in |
| zmedico | --usepkgonly or --getbinpkgonly mode, since --usepkgonly |
| | behaves better in cases when the portage tree is not |
| | exactly the same revision that was used to build the |
| | packages. |
| 15428 | Fix "NameError: global name 'basestring' is not defined" |
| arfrever | with Python 3. |
| 15429 | Fix "AttributeError: 'module' object has no attribute |
| arfrever | 'mappings'". Also fix some typos. |
svn path=/main/branches/prefix/; revision=15434
Fabian Groffen [Mon, 22 Feb 2010 13:02:22 +0000 (13:02 -0000)]
Merged from trunk -r15417:15421
| 15418 | Bug #299095 - Add a deprecation warning for check_license |
| zmedico | calls with EAPI >= 3 since it is superceded by LICENSE |
| | masking. |
| 15419 | Use lazy import for the portage.dbapi module. |
| zmedico | |
| 15420 | Don't import the portage.dbapi.dbapi class as portage.dbapi |
| zmedico | anymore, since it results in a strange namespace collision |
| | (portage.dbapi is both a class and a module). Hopefully this |
| | won't break any api consumers since it's a pure virtual |
| | class anyway. |
| 15421 | Create a directory for splitting the portage.util module |
| zmedico | into smaller files. |
svn path=/main/branches/prefix/; revision=15433
Fabian Groffen [Mon, 22 Feb 2010 13:01:13 +0000 (13:01 -0000)]
Merged from trunk -r15407:15417
| 15409 | Add missing newline to the "CONFIG_PROTECT is empty" warning |
| zmedico | message. |
| 15410 | Move portage.cpv_getkey() to the portage.versions module. |
| zmedico | |
| 15411 | Add a note about --rebuilt-binaries. |
| zmedico | |
| 15412 | Handle CacheCorruption from self.db_ro in _setitem, |
| zmedico | triggered by INHERITED containing non-existent eclass inside |
| | metadata.database._parse_data. Thanks to Vlastimil Babka |
| | <caster@g.o> for reporting. |
| 15413 | Move portage.flatten to portage.dep.flatten. |
| zmedico | |
| 15414 | Show a deprecation warning when digestParseFile() is called. |
| zmedico | |
| 15415 | Show a deprecation warning when pkgmerge() is called. |
| zmedico | |
| 15416 | Show a deprecation warning when getvirtuals() is called. |
| zmedico | |
| 15417 | Move the portage.FetchlistDict class to the |
| zmedico | portage.dbapi.porttree module. |
svn path=/main/branches/prefix/; revision=15432
Fabian Groffen [Mon, 22 Feb 2010 12:58:01 +0000 (12:58 -0000)]
Merged from trunk -r15397:15407
| 15398 | Use a valid atom in the dep_getkey docstring. |
| zmedico | |
| 15399 | Use Atom.cp instead of dep_getkey. |
| zmedico | |
| 15400 | Use Atom.cp instead of dep_getkey. |
| zmedico | |
| 15401 | Use Atom.cp instead of dep_getkey. |
| zmedico | |
| 15402 | Remove deprecated key_expand function and |
| zmedico | config.load_infodir method. |
| 15403 | Add DeprecationWarning to dep_virtual function. |
| zmedico | |
| 15404 | Remove deprecated methods that call removed key_expand |
| zmedico | function. |
| 15405 | Add stacklevel=2 to warnings.warn() calls. |
| zmedico | |
| 15406 | Add stacklevel=2 to warnings.warn calls. |
| zmedico | |
| 15407 | Use a frozenset for use inside binarytree._eval_use_flags(). |
| zmedico | |
svn path=/main/branches/prefix/; revision=15431
Fabian Groffen [Mon, 22 Feb 2010 12:56:52 +0000 (12:56 -0000)]
Merged from trunk -r15387:15397
| 15388 | Fix deprecated usage of dep_getkey. |
| zmedico | |
| 15390 | Fix deprecated usage of dep_getkey. |
| zmedico | |
| 15391 | Fix deprecated usage of dep_getkey. |
| zmedico | |
| 15392 | Bug #303519 - Call warnings.warn() with stacklevel=2 inside |
| zmedico | dep_getkey and dep_getcpv so that the caller is displayed. |
| 15393 | Bug #268724 - Show a warning message for --unmerge |
| zmedico | operations and suggest --depclean instead. |
| 15394 | Bail out when given an invalid mode. |
| zmedico | |
| 15395 | Fix deprecated usage of dep_getkey. |
| zmedico | |
| 15396 | Fix deprecated usage of dep_getkey. |
| zmedico | |
| 15397 | Use isvalidatom to validate PROVIDE entries. |
| zmedico | |
svn path=/main/branches/prefix/; revision=15430
Fabian Groffen [Fri, 19 Feb 2010 10:21:02 +0000 (10:21 -0000)]
Merged from trunk -r15380:15383
| 15381 | Fix deprecated dep_getkey usage in match_from_list. |
| zmedico | |
| 15382 | Fix deprecated usage of dep_getkey. |
| zmedico | |
| 15383 | Fix deprecated usage of dep_getkey. |
| zmedico | |
svn path=/main/branches/prefix/; revision=15389
Fabian Groffen [Fri, 19 Feb 2010 10:18:20 +0000 (10:18 -0000)]
Merged from trunk -r15370:15380
| 15371 | Remove unused merge_cmd variable. |
| zmedico | |
| 15372 | Only enable --rebuilt-binaries automatically if --update and |
| zmedico | --deep are also enabled. |
| 15373 | Allow --rebuilt-binaries to trigger downgrades. |
| zmedico | |
| 15374 | Deprecate the unused getbinpkgsonly parameter to |
| zmedico | binarytree.populate(). |
| 15375 | Remove the deprecated 'clone' parameter to the binarytree |
| zmedico | constructor. |
| 15376 | Remove deprecated binarytree.get_use() method. |
| zmedico | |
| 15377 | Remove deprecated portdbapi.getfetchlist() method. |
| zmedico | |
| 15378 | Remove the deprecated 'clone' parameter from the portagetree |
| zmedico | constructor. |
| 15379 | Use a property to trigger deprecation warnings if |
| zmedico | binarytree.remotepkgs is accessed. |
| 15380 | Make dep_getkey() recommend cpv_getkey() if given a cpv. |
| zmedico | |
svn path=/main/branches/prefix/; revision=15387
Fabian Groffen [Fri, 19 Feb 2010 10:16:30 +0000 (10:16 -0000)]
Merged from trunk -r15360:15370
| 15361 | Fix type in CLEAN_DELAY docs. |
| zmedico | |
| 15362 | Bug #303567 - Merge libc asap, in order to account for |
| zmedico | implicit dependencies. |
| 15363 | Add @rebuilt-binaries set which uses BUILD_TIME to pull in |
| zmedico | binary packages that have a different build time from a |
| | currently installed package of the exact same version. |
| 15364 | Add a --rebuilt-binaries[=n] option, causing automatic |
| zmedico | replacement of installed packages with binary packages that |
| | have been rebuilt. Rebuilds are detected by comparison of |
| | BUILD_TIME package metadata. This option is enabled |
| | automatically when using binary packages, so rebuilt |
| | binaries are installed with a user's typical update command. |
| | This isn't possible with the existing @rebuild-binaries |
| | package set since that only works with --selective=n and |
| | therefore can't be used with a typical world update. The |
| | package set framework should support this type of behavior |
| | sometime in the future. |
| 15365 | Bug #305393 - Handle new sdiff exit status for |
| zmedico | diffutils-2.9. |
| 15366 | Add a comment about slowness in _serialize_tasks when there |
| zmedico | are lots of blockers to solve. |
| 15367 | Fix colors for --rebuilt-binaries docs. |
| zmedico | |
| 15368 | Fix broken diffutils vercmp code. |
| zmedico | |
| 15369 | Update the spinner in depgraph._serialize_tasks when |
| zmedico | searching for suitable uninstall tasks. |
| 15370 | Remove diffutils version detection code since it's not |
| zmedico | really needed. |
svn path=/main/branches/prefix/; revision=15386
Fabian Groffen [Fri, 19 Feb 2010 10:14:15 +0000 (10:14 -0000)]
Merged from trunk -r15350:15360
|15351 |Evaluate conditional USE deps for *DEPEND atoms saved in vdb entries. |
|zmedico| |
|15352 |Bug #304981 - Truncate the build log after successful fetch, instead of removing it, so as|
|zmedico|not to interfere with tail -f. |
|15353 |Prevent CHOST vdb entries from being created for virtual packages. |
|zmedico| |
|15354 |Make sure that config._accept_chost() accepts empty CHOST. |
|zmedico| |
|15355 |Use config.environ() instead of config.items() when spawning FETCHCOMMAND. |
|zmedico| |
|15356 |Add a 'trees' parameter to portdbapi.cp_all(). Thanks to Brian Dolbec (dol-sen) for this |
|zmedico|patch. |
|15357 |Add a BUILD_TIME vdb entry containing the integer number of seconds since the unix Epoch. |
|zmedico|This will be useful for creating package sets that involve comparison of installed |
| |packages to binary packages, especially for binhost users. See discussion here: |
| |http://archives.gentoo.org/gentoo-portage-dev/msg_d068a8deefd179cc23808bc23f3de200.xml |
|15358 |Cache BUILD_TIME in vdb_metadata.pickle. |
|zmedico| |
|15359 |Cache BUILD_TIME in Package.metadata. |
|zmedico| |
|15360 |Cache BUILD_TIME in $PKGDIR/Packages and inside bindbapi. |
|zmedico| |
svn path=/main/branches/prefix/; revision=15385
Fabian Groffen [Fri, 19 Feb 2010 10:12:27 +0000 (10:12 -0000)]
Merged from trunk -r15340:15350
| 15341 | Fix dblink._eerror argument where list is required instead |
| zmedico | of string. |
| 15342 | Remove unnecessary newline in dblink._eerror message. |
| zmedico | |
| 15343 | Logg errors that occur during binpkg extraction. |
| zmedico | |
| 15344 | Use os.environ instead of the config.environ(). This solves |
| zmedico | binpkg extraction issues with catalyst stage1 due to PATH |
| | being unset and bzip2/tar binaries not being found by bash. |
| 15345 | When creating a config instance for ROOT=/ with a clean env, |
| zmedico | copy PATH and TERM variables, since they may be useful. |
| 15346 | Bug #304793 - Update --newuse docs to indicate that this |
| zmedico | option also implies --selective. |
| 15347 | Bug #262647 - Explicitly exclude SRC_URI and other |
| zmedico | potentially long metadata variables from config.environ() |
| | exports, to avoid potential E2BIG errors from execve calls. |
| 15348 | Evaluate USE conditionals when writing vdb entries after |
| zmedico | src_install. |
| 15349 | After src_install, save fewer variables when writing the vdb |
| zmedico | entry for a virtual package. |
| 15350 | Don't save SRC_URI as a vdb entry since it's pretty useless |
| zmedico | and it's available in environment.bz2 anyway. |
svn path=/main/branches/prefix/; revision=15384
Fabian Groffen [Thu, 11 Feb 2010 19:05:09 +0000 (19:05 -0000)]
Merged from trunk -r15336 and -r15339
| 15336 | Ignore blockers in DEPEND of built packages when |
| zmedico | --with-bdeps is enabled. |
| 15339 | Make previous commit use eerror for logging. |
| zmedico | |
svn path=/main/branches/prefix/; revision=15340
Fabian Groffen [Thu, 11 Feb 2010 18:36:10 +0000 (18:36 -0000)]
try to be more forgiving if unlinking fails, because we end up in an unknown state if we die right away, as demonstrated by darkside
svn path=/main/branches/prefix/; revision=15337
Fabian Groffen [Wed, 10 Feb 2010 18:49:31 +0000 (18:49 -0000)]
Merged from trunk -r15320:15333
| 15321 | Bug #303445 - Fix getmaskingreason() to reset comment state |
| zmedico | when looping to the next package.mask file. |
| 15322 | Bug #303401 - Fix emerge.log disabling code that's been |
| zmedico | broken since portage-2.1.7 when the _emerge module got split |
| | up. |
| 15323 | Add an optional 'categories' parameter to |
| zmedico | portdbapi.cp_all(), for listing a subset of categories. |
| | Thanks to dol-sen for the suggestion. |
| 15324 | Fix deprecated reference to portdbapi.mysettings. |
| zmedico | |
| 15325 | Add a portdbapi.getRepositoryName() method which is the |
| zmedico | inverse of getRepositoryPath(). |
| 15326 | Import portage.StringIO for ImportError handling. |
| zmedico | |
| 15327 | Skip atom validation in WorldHandler since WorldSelectedSet |
| zmedico | handles this already, and use Atom.cp instead of |
| | dep_getkey(). |
| 15328 | Make Glsa constructor raise GlsaFormatException when a |
| zmedico | package name attribute is invalid. |
| 15329 | Use cpv_getkey() instead of dep_getkey() where appropriate. |
| zmedico | |
| 15330 | Use Atom.cp instead of dep_getkey(), and use cpv_getkey() |
| zmedico | instead of dep_getkey() where appropriate. |
| 15331 | Use Atom.cp instead of dep_getkey(). |
| zmedico | |
| 15332 | Bug #298479 - Filter $USER from the ebuild environment since |
| zmedico | it's inaccurate with FEATURES=userpriv. |
| 15333 | Bug #303211 - Discard invalid SIZE metadata when using the |
| zmedico | old binhost protocol. |
svn path=/main/branches/prefix/; revision=15335
Fabian Groffen [Wed, 10 Feb 2010 18:46:43 +0000 (18:46 -0000)]
Merged from trunk -r15302:15303
| 15303 | Fix AttributeError when adjusting incrementals. Thanks to |
| zmedico | Jonathan Callen <abcd@g.o> for reporting. |
svn path=/main/branches/prefix/; revision=15334
Fabian Groffen [Thu, 4 Feb 2010 19:09:17 +0000 (19:09 -0000)]
Merged from trunk -r15303:15318
| 15304 | Bug #302937 - Handle declare -r without assignment. |
| zmedico | |
| 15305 | Validate categories. |
| zmedico | |
| 15306 | Deprecate pordbapi.mysettings since the portdbapi.settings |
| zmedico | alias is now supported by stable portage. |
| 15307 | Bug #298141 - Make /etc/portage/sets relative to |
| zmedico | PORTAGE_CONFIGROOT. Thanks to Martin Gysel (bearsh) |
| | <m.gysel@gmx.ch> for this patch. |
| 15308 | Fix @module-rebuild to support $ROOT. |
| zmedico | |
| 15309 | Clean up config incrementals handling. |
| zmedico | |
| 15310 | Simplify the conditional that triggers calculation of A and |
| zmedico | AA variables. |
| 15311 | Deallocate config instance when necessary, to avoid memory |
| zmedico | leak when in prefetch mode. |
| 15312 | Optimize parallel-fetch for the case where all files are |
| zmedico | already fetched and have the correct size. In this case we |
| | can avoid the expense of spawning ebuild(1). |
| 15313 | Make sure the fetcher process correctly inherits |
| zmedico | PORTAGE_CONFIGROOT. |
| 15314 | Fix deprecated portdbapi.mysettings reference. |
| zmedico | |
| 15315 | Use stat rather than lstat since portage.fetch() creates |
| zmedico | symlinks when PORTAGE_RO_DISTDIRS is used. |
| 15316 | Use Package.use.enabled where appropriate. |
| zmedico | |
| 15317 | Bug #295197 - Output a newline after valid user input is |
| zmedico | received. |
| 15318 | Make verify_all() do checksums in sorted order by hash name. |
| zmedico | |
svn path=/main/branches/prefix/; revision=15320
Fabian Groffen [Thu, 4 Feb 2010 19:03:41 +0000 (19:03 -0000)]
fix backtrace with -r0 revisions, by Paul Varner, bug #303145
svn path=/main/branches/prefix/; revision=15319
Fabian Groffen [Sun, 31 Jan 2010 09:44:08 +0000 (09:44 -0000)]
Merged from trunk -r15292:15298
| 15293 | Fix: change os.mkdir to os.makedirs in case of there are |
| volkmar | more than one directory depth missing. According to |
| | docs.python.org, permissions may be not respected with |
| | os.makedirs... with some systems. |
| 15294 | Avoid NameError when cwd is $FILESDIR. Thanks to Christian |
| zmedico | Ruppert <idl0r@g.o> for reporting. |
| 15295 | Bug #302764 - Inside __iter__, only recurse 1 deep, in order |
| zmedico | to avoid iteration over entries from another nested cache |
| | instance. This can happen if the user nests an overlay |
| | inside /usr/portage/local. Thanks to Vlastimil Babka |
| | <caster@g.o> for this patch. |
| 15296 | Make __iter__ use list.pop() instead of pop(0), for greater |
| zmedico | efficiency. |
| 15297 | In __iter__, handle OSError from lstat in case a cache entry |
| zmedico | disappears. |
| 15298 | Reverting r15293, it was actually not needed. |
| volkmar | |
svn path=/main/branches/prefix/; revision=15302
Fabian Groffen [Sun, 31 Jan 2010 09:43:08 +0000 (09:43 -0000)]
Merged from trunk -r15285:15292
| 15286 | fix: python dbm module doesn't accept unicode as key |
| volkmar | |
| 15287 | Define __slots__ in all classes. |
| zmedico | |
| 15288 | In config._expandLicenseToken(), make sure traversed_groups |
| zmedico | is only initialized when appropriate. |
| 15289 | Fix concatenation of list + tuple in |
| zmedico | Manifest._createManifestEntries(). |
| 15290 | Don't generate DeprecationWarning for portdbapi arguments. |
| zmedico | Wait until new portdbapi constructor is in stable portage |
| | first. |
| 15291 | fix flat_list cache backend looks like it was outdated wrt. |
| volkmar | template cache backend |
| 15292 | Show a DeprecationWarning if the deprecated pordbapi |
| zmedico | constructor parameter is used incorrectly. |
svn path=/main/branches/prefix/; revision=15301
Fabian Groffen [Sun, 31 Jan 2010 09:41:21 +0000 (09:41 -0000)]
Merged from trunk -r15280:15285
| 15281 | Deprecate the first parameter of the portdbapi constructor |
| zmedico | since it is always the same as mysettings['PORTDIR']. |
| 15282 | Use tuples instead of lists for immutability. |
| zmedico | |
| 15283 | For immutable config attributes, use shallow copy for speed |
| zmedico | and memory conservation. |
| 15284 | For immutable config attributes, use shallow copy for speed |
| zmedico | and memory conservation. |
| 15285 | For immutable config attributes, use shallow copy for speed |
| zmedico | and memory conservation. |
svn path=/main/branches/prefix/; revision=15300
Fabian Groffen [Sun, 31 Jan 2010 09:40:03 +0000 (09:40 -0000)]
Merged from trunk -r15272:15280
| 15277 | Define userpriv_groups earlier in order to avoid an |
| zmedico | AttributeError from lazy import code. Thanks to antarus for |
| | reporting. |
| 15278 | Bug #277902 - When excluding config files, instead of using |
| zmedico | an empty file as a placeholder, use a file containing a |
| | comment like this: # empty file because --include-config=n |
| | when `quickpkg` was used |
| 15279 | Fix conditional logic for userpriv_groups intialization. |
| zmedico | |
| 15280 | Fix code from r15278 for python3 unicode compatibility. |
| zmedico | |
svn path=/main/branches/prefix/; revision=15299
Fabian Groffen [Fri, 29 Jan 2010 20:43:56 +0000 (20:43 -0000)]
Merged from trunk -r15218:15272
| 15220 | Show the path of the lockfile when chown fails. Thanks to |
| zmedico | Jeremy Olexa <darkside@g.o> for reporting. |
| 15221 | Enable EAPI 3 and deprecate EAPI 3_pre2. |
| zmedico | |
| 15222 | Remove code for svn.IO_error and bzr.IO_error categories |
| zmedico | since they don't exist therefore and if this code had ever |
| | executed it would have raised a KeyError. |
| 15272 | Don't ignore CVS/Entries.IO_error when not in commit mode. |
| zmedico | |
svn path=/main/branches/prefix/; revision=15274
Fabian Groffen [Fri, 29 Jan 2010 18:02:04 +0000 (18:02 -0000)]
Merged from trunk -r15214:15218
| 15216 | Move the DOM unlink call to a finally block. |
| zmedico | |
| 15217 | Bug #300378 - Don't export FILESDIR to the 'depend' phase. |
| zmedico | |
| 15218 | In portage.spawn(), apply group write permission to the log |
| zmedico | file. |
svn path=/main/branches/prefix/; revision=15219
Fabian Groffen [Thu, 28 Jan 2010 18:01:56 +0000 (18:01 -0000)]
Merged from trunk -r15210:15214
| 15211 | Add support for evaluation of conditional USE atoms in |
| zmedico | has_version and best_version arguments, using the USE |
| | environment variable. |
| 15212 | Add an Atom.evaluate_conditionals() method and use where |
| zmedico | appropriate. |
| 15213 | Fix typo in docstring. |
| zmedico | |
| 15214 | Fix AttributeError from has_versions for atoms with no USE |
| zmedico | deps. Thanks to Arfrever for reporting. |
svn path=/main/branches/prefix/; revision=15215
Fabian Groffen [Tue, 26 Jan 2010 17:53:51 +0000 (17:53 -0000)]
Merged from trunk -r15206:15209
| 15207 | Bug #301926 - Handle ValueError in parseManifest2(), |
| zmedico | triggered by corrupt manifest entry. |
| 15208 | Bug #302005 - Remove broken test code. |
| zmedico | |
| 15209 | Add a warning for built_with_use. Thanks to Petteri Räty |
| zmedico | <betelgeuse@g.o> for this patch. |
svn path=/main/branches/prefix/; revision=15210
Fabian Groffen [Tue, 19 Jan 2010 17:02:13 +0000 (17:02 -0000)]
Merged from trunk -r15200:15205
| 15201 | Remove ibiblio.org from the default GENTOO_MIRRORS value. |
| zmedico | Thanks to Jeremy Olexa <darkside@g.o> for this patch. |
| 15202 | Don't bail out if postinst fails. Thanks to Brain Harring |
| zmedico | for the suggestion. |
| 15203 | Support mercurial. Thanks to Rafael Martins |
| zmedico | <rafael@rafaelmartins.com> for this patch. |
| 15204 | Invert some vcs conditionals that are specific to cvs and |
| zmedico | svn. |
| 15205 | Fix Manifest commit logic for cvs and svn. Thanks to Rafael |
| zmedico | Martins <rafael@rafaelmartins.com>. |
svn path=/main/branches/prefix/; revision=15206
Fabian Groffen [Thu, 14 Jan 2010 18:48:20 +0000 (18:48 -0000)]
Merged from trunk -r15193:15199
| 15194 | Avoid portage import in order to avoid a potential sandbox |
| zmedico | violation if portage's *.pyc files are stale. |
| 15195 | Fix unicode quote handling to work with python3. |
| zmedico | |
| 15196 | Fix output handling to avoid potential UnicodeEncodeError. |
| zmedico | |
| 15197 | Use encoded byte strings with python-2.x, since the python |
| zmedico | ebuilds are known to remove the encodings module when |
| | USE=build is enabled (thus disabling unicode |
| | decoding/encoding). |
| 15198 | Bug #300744 - Inside xpak(), exclude CONTENTS for quickpkg |
| zmedico | since contents is generated by the merge process. |
| 15199 | Make sure repoman knows about all files in the directory to |
| grobian | commit using bzr. Patch by Christian Faulhammer. |
svn path=/main/branches/prefix/; revision=15200
Fabian Groffen [Mon, 11 Jan 2010 19:45:03 +0000 (19:45 -0000)]
Merged from trunk -r15189:15192
| 15190 | Tweak TERM usage in xtermTitleReset() to match that in |
| zmedico | xtermTitle(). |
| 15191 | Bug #300388 - Fix terminal handling code to so term codes |
| zmedico | aren't sent when TERM=dumb. |
| 15192 | Avoid potential UnicodeDecodeError with Python 3. Reported |
| arfrever | by devurandom. |
svn path=/main/branches/prefix/; revision=15193
Fabian Groffen [Sun, 10 Jan 2010 16:54:00 +0000 (16:54 -0000)]
Merged from trunk -r15187:15188
| 15188 | only return status for the current directory (or the |
| grobian | directory being asked for), instead of the whole tree |
svn path=/main/branches/prefix/; revision=15189
Fabian Groffen [Sun, 10 Jan 2010 14:44:15 +0000 (14:44 -0000)]
Merged from trunk -r15184:15185
| 15185 | Add Bazaar (bzr) support for repoman, test-driven by Fauli |
| grobian | (Christian Faulhammer) |
svn path=/main/branches/prefix/; revision=15187
Fabian Groffen [Sun, 10 Jan 2010 14:42:33 +0000 (14:42 -0000)]
we also use env inside dolinkingstuff
svn path=/main/branches/prefix/; revision=15186
Fabian Groffen [Sat, 9 Jan 2010 15:29:51 +0000 (15:29 -0000)]
Because of my setup, one of my repos often changes location due to a symlink switch. Don't backtrace but just give me an "unknown repo" message instead. This fix is eligable for trunk to take over.
svn path=/main/branches/prefix/; revision=15184
Fabian Groffen [Sat, 9 Jan 2010 15:17:09 +0000 (15:17 -0000)]
Make prev_mtimes available, archives.gentoo.org/gentoo-alt/msg_e3d3c24a0dc46fb0ff56806269971c64.xml
svn path=/main/branches/prefix/; revision=15183
Fabian Groffen [Sat, 9 Jan 2010 15:09:35 +0000 (15:09 -0000)]
add back EPREFIX to mysettings, some people have reported big problems starting from the release where we removed this
svn path=/main/branches/prefix/; revision=15182
Fabian Groffen [Sat, 9 Jan 2010 15:05:08 +0000 (15:05 -0000)]
Merged from trunk -r15178:15180
| 15179 | Skip global updates for help, version, and info actions. |
| zmedico | |
| 15180 | Fix blocker example output to appear as emerge actually |
| zmedico | displays it. |
svn path=/main/branches/prefix/; revision=15181
Fabian Groffen [Fri, 8 Jan 2010 12:09:23 +0000 (12:09 -0000)]
make sure we don't run abspath on the empty string, such that we get the current working directory instead of / as we want, fixes problems with offset-less installations (EPREFIX='')
svn path=/main/branches/prefix/; revision=15178
Fabian Groffen [Fri, 8 Jan 2010 12:00:30 +0000 (12:00 -0000)]
Fix some broken lines, possibly fixing bug #299163
svn path=/main/branches/prefix/; revision=15177
Fabian Groffen [Fri, 8 Jan 2010 11:32:45 +0000 (11:32 -0000)]
whitelist UNIXMODE for MiNT-like OSes
svn path=/main/branches/prefix/; revision=15176
Fabian Groffen [Fri, 8 Jan 2010 07:48:41 +0000 (07:48 -0000)]
Merged from trunk -r15169:15174
| 15172 | Fix it so an empty directory given to doins -r does not |
| zmedico | trigger failure. |
| 15173 | Add a TODO comment for improved handling of /lib/modules. |
| zmedico | |
| 15174 | Bug #269225 - Warn about virtuals with non-empty HOMEPAGE or |
| zmedico | LICENSE. Thanks to Ulrich Müller <ulm@g.o> for this patch. |
svn path=/main/branches/prefix/; revision=15175
Fabian Groffen [Tue, 5 Jan 2010 19:26:14 +0000 (19:26 -0000)]
Merged from trunk -r15166:15169
| 15167 | Rearrange _selinux ImportError handling so the workaround |
| zmedico | for bug #298310 isn't necessary. |
| 15168 | Handle AttributeError inside atomic_ofstream.__del__. Thanks |
| zmedico | to Cardoe for reporting. |
| 15169 | In python-2.x, convert PortageException.value attribute from |
| zmedico | unicode to str in order to avoid empty output with string |
| | format operator. |
svn path=/main/branches/prefix/; revision=15171
Fabian Groffen [Tue, 5 Jan 2010 19:23:45 +0000 (19:23 -0000)]
Merged from trunk -r15154:15166
| 15155 | Add some tests related to bug #287848. |
| zmedico | |
| 15156 | Use get_term_size() to adjust to current terminal width. |
| zmedico | Thanks to Dror Levin <spatz@g.0> for the initial patch. |
| 15157 | Document doins -r option. |
| zmedico | |
| 15158 | Bug #299248 - Fix doins return code handling to make sure it |
| zmedico | always fails when appropriate. Thanks to Jonathan Callen |
| | <abcd@g.o> for the initial patch. |
| 15159 | Bug #298310 - Make sure the _selinux attribute is correctly |
| zmedico | reinitialized after reload(portage) is called. |
| 15160 | Add test cases for implicit .0 at end of version. |
| zmedico | |
| 15161 | Revert vercmp() behavior so 12.2b > 12.2.5 which was |
| zmedico | accidentally changed in r2309 (between portage-2.0.x and |
| | portage-2.1). Thanks to Brian Harring for reporting in bug |
| | #287848, comment #3. |
| 15162 | Fix vercmp so 1b > 1 and add corresponding tests. |
| zmedico | |
| 15163 | Add test cases for cvs versions. |
| zmedico | |
| 15164 | Add some more cases for versions with letter suffixes. |
| zmedico | |
| 15165 | More cases. |
| zmedico | |
| 15166 | Revert r15161 so 12.2.5 is greater than 12.2b once again. |
| zmedico | Depending on how you look at, it may seem counter-intuitive. |
| | However, if you really think about it, it seems like it's |
| | probably safe to assume that 12.2.5 > 12.2b is the behavior |
| | that is intended by anyone who would use versions such as |
| | these. |
svn path=/main/branches/prefix/; revision=15170
Fabian Groffen [Mon, 28 Dec 2009 15:54:49 +0000 (15:54 -0000)]
cut/paste error, make sure things like emake are available in the ebuild
svn path=/main/branches/prefix/; revision=15154
Fabian Groffen [Mon, 28 Dec 2009 09:25:24 +0000 (09:25 -0000)]
Merged from trunk -r15142:15151
| 15143 | Remove obsolete backing up of ROOTPATH via PORTAGE_ROOTPATH. |
| zmedico | |
| 15145 | In save_ebuild_env(), preserve all ebuild phases in any case |
| zmedico | since excluding the already executed ones from |
| | environment.bz2 doesn't save much space, and it's possible |
| | that someone would want to look at them later. |
| 15147 | Remove stray echo. |
| zmedico | |
| 15149 | Bug #297364 - Only set EAPI conditional PATH once after |
| zmedico | sourcing the ebuild (when the EAPI is first known) rather |
| | than for each phase. |
svn path=/main/branches/prefix/; revision=15153
Fabian Groffen [Tue, 22 Dec 2009 22:01:53 +0000 (22:01 -0000)]
misc fixes to make binpkg installs work with Prefix again
svn path=/main/branches/prefix/; revision=15134
Fabian Groffen [Tue, 22 Dec 2009 21:12:36 +0000 (21:12 -0000)]
it helps when you use the right class name
svn path=/main/branches/prefix/; revision=15133
Fabian Groffen [Tue, 22 Dec 2009 20:51:16 +0000 (20:51 -0000)]
Merged from trunk -r15123:15130
| 15124 | Remove some old debug code that should not have been |
| zmedico | committed. |
| 15125 | When integer mtime is desired, use stat_obj[stat.ST_MTIME] |
| zmedico | instead of the float st_mtime in order to avoid rounding |
| | *up* in some rare cases. |
| 15126 | When integer mtime is desired, use stat_obj[stat.ST_MTIME] |
| zmedico | instead of the float st_mtime in order to avoid rounding |
| | *up* in some rare cases. |
| 15127 | Add missing stat import. |
| zmedico | |
| 15128 | Bug #297541 - Make $(no-as-needed) trigger |
| zmedico | upstream.workaround warning. Thanks to Samuli Suominen |
| | <ssuominen@g.o> for this patch. |
| 15129 | If the TERM environment variable is unset then just use |
| zmedico | internal default term codes since the vt100 codes typically |
| | produce strange output. This fixes strange output from |
| | catalyst stage1 builds. |
| 15130 | Bug #297933: Filter BASHOPTS variable for compatibility |
| arfrever | with bash-4.1. |
svn path=/main/branches/prefix/; revision=15132
Fabian Groffen [Tue, 22 Dec 2009 20:48:42 +0000 (20:48 -0000)]
Add another chain in the string to run chpathtool. It seems the old code in portage/pym/__init__.py is no longer used, and now this asynchronous implementation is used instead.
svn path=/main/branches/prefix/; revision=15131
Fabian Groffen [Sun, 20 Dec 2009 17:48:38 +0000 (17:48 -0000)]
Merged from trunk -r15118:15121
| 15119 | Fix the assert alias to 'value to great for base' messages |
| zmedico | in some cases. Thanks to Jonathan Callen <abcd@g.o> for |
| | reporting. |
| 15120 | Revert previous commit because it's no comptible (doesn't |
| zmedico | pass arguments to die). |
| 15121 | Fix the assert alias to avoid 'value to great for base' |
| zmedico | messages in some cases. Thanks to Jonathan Callen <abcd@g.o> |
| | for reporting. |
svn path=/main/branches/prefix/; revision=15123
Fabian Groffen [Sun, 20 Dec 2009 17:45:31 +0000 (17:45 -0000)]
make sure EXTRA_PATH isn't filtered by Portage (such that it disappears in ebuild.sh), and don't save it in environment.bz2
svn path=/main/branches/prefix/; revision=15122
Fabian Groffen [Fri, 18 Dec 2009 08:32:44 +0000 (08:32 -0000)]
Merged from trunk -r15057:15110
| 15058 | Bug #296554 - Add decompression support to ecompress |
| zmedico | (similar to ecompressdir behavior) since dodoc can call |
| | ecompress with stuff that's already compressed in some way. |
| 15059 | Combine 2 shift calls into one. |
| zmedico | |
| 15096 | Bug #296870 - Allow locale related LANG and LC_* variables |
| zmedico | to persist between ebuild phases, and only filter them for |
| | binary and installed packages. |
| 15097 | Warn if /proc is not mounted. |
| zmedico | |
| 15098 | Bug #296710 - Add equery to QA_INTERCEPTORS since it can |
| zmedico | trigger a fork bomb. |
| 15099 | Fix typo. |
| arfrever | |
| 15100 | Bug #286497 - Make setexec() warn/nonfatal in permissive |
| zmedico | mode. Thanks to Chris PeBenito <pebenito@gentoo.org> for |
| | this patch. |
| 15106 | Convert bytes to unicode for exception messages. |
| zmedico | |
| 15108 | Use portage.writemsg for lazy portage.util import. |
| zmedico | |
svn path=/main/branches/prefix/; revision=15118
Fabian Groffen [Fri, 18 Dec 2009 08:30:03 +0000 (08:30 -0000)]
Merged from trunk -r15053:15056
| 15054 | In movefile mtime preservation code, simply round down to |
| zmedico | the nearest whole second since python's float cannot |
| | preserve the st_mtim.tv_nsec field with complete precision. |
| | Note that we have to use stat_obj[stat.ST_MTIME] here |
| | because the float stat_obj.st_mtime rounds *up* sometimes. |
| 15055 | Bug #296641 - Avoid UnicodeEncodeError with python2 in |
| zmedico | eapi_is_supported() triggered by corrupt EAPI. |
| 15056 | Inside depgraph._validate_blockers(), do not consider |
| zmedico | blockers in DEPEND of installed packages, since DEPEND is |
| | supposed to be irrelevant for packages after they are built. |
svn path=/main/branches/prefix/; revision=15117
Fabian Groffen [Fri, 18 Dec 2009 08:28:46 +0000 (08:28 -0000)]
Remove redundant EPREFIX, EROOT, and ROOT assingments inside doebuild_environment(). (r15052)
svn path=/main/branches/prefix/; revision=15116
Fabian Groffen [Fri, 18 Dec 2009 08:26:50 +0000 (08:26 -0000)]
Merged from trunk -r15050:15051
| 15051 | Remove unused STARTDIR variable. |
| zmedico | |
svn path=/main/branches/prefix/; revision=15115
Fabian Groffen [Fri, 18 Dec 2009 08:24:01 +0000 (08:24 -0000)]
Merged from trunk -r15044:15048
| 15045 | Fix typo. |
| arfrever | |
| 15046 | In movefile mtime rounding code, generate nanosecond |
| zmedico | resolution (9 decimal places) in order to ensure that the |
| | floating point representation is the highest value possible |
| | without rounding up. |
| 15047 | Fix typo. |
| zmedico | |
| 15048 | * Fix type in econf --host argument. * Add missing econf |
| zmedico | --build and --target arguments. * Use tabs instead of |
| | spaces for indentation. |
svn path=/main/branches/prefix/; revision=15114
Fabian Groffen [Fri, 18 Dec 2009 08:22:04 +0000 (08:22 -0000)]
Remove redundant EPREFIX setting since it's already initialized earlier in the config constructor. (r15044)
svn path=/main/branches/prefix/; revision=15113
Fabian Groffen [Fri, 18 Dec 2009 08:19:05 +0000 (08:19 -0000)]
Merged from trunk -r15032:15043
| 15033 | Add support for EAPI 3_pre2. |
| zmedico | |
| 15034 | Enable xz unpack for EAPI 3_pre2. |
| zmedico | |
| 15035 | Add EAPI 3_pre2 to conditinals so the EAPI 4 stuff is |
| zmedico | disabled. |
| 15036 | Add EAPI to the whitelist to ensure it's always available as |
| zmedico | early as possible. |
| 15037 | In movefile() timestamp preservation code, use another loop |
| zmedico | to search for another digit of precision. |
| 15038 | Add missing line from previous commit. |
| zmedico | |
| 15039 | Tweak movefile() timestamp preservation code to maximize |
| zmedico | precision for old timestamps that are closer to the epoch. |
| 15040 | Just use integer mtime if no fractional seconds are found in |
| zmedico | the search. |
| 15041 | Add EAPI 3 conditionals for prefix variables. |
| zmedico | |
| 15042 | Add more EAPI 3 conditionals for prefix variables. |
| zmedico | |
| 15043 | Update for EAPI 3_pre2. |
| zmedico | |
svn path=/main/branches/prefix/; revision=15112
Fabian Groffen [Tue, 15 Dec 2009 08:14:21 +0000 (08:14 -0000)]
fix etc-update trying to chown the tempdir to a group that requires root privileges
svn path=/main/branches/prefix/; revision=15095
Fabian Groffen [Sat, 12 Dec 2009 11:48:35 +0000 (11:48 -0000)]
Merged from trunk -r15027:15029
| 15028 | Use collections.OrderedDict when available (python-2.7) and |
| zmedico | fall back to portage.cache.mappings.OrderedDict for older |
| | python. Also, use OrderedDict inside fetch() so that files |
| | are fetched in the order that they appear in SRC_URI. |
| 15029 | Don't use lazy import for portage.cache.mappings because |
| zmedico | it's imported anyway. |
svn path=/main/branches/prefix/; revision=15053
Fabian Groffen [Thu, 10 Dec 2009 19:14:07 +0000 (19:14 -0000)]
forward port r15024
svn path=/main/branches/prefix/; revision=15027
Fabian Groffen [Thu, 10 Dec 2009 08:48:37 +0000 (08:48 -0000)]
remove unneccessary import
svn path=/main/branches/prefix/; revision=15025
Fabian Groffen [Thu, 10 Dec 2009 08:14:14 +0000 (08:14 -0000)]
Merged from trunk -r14994:15019
| 14995 | In movefile(), always use stat_obj[stat.ST_MTIME] for the |
| zmedico | integral timestamp which is returned, since the |
| | stat_obj.st_mtime float attribute rounds *up* if the |
| | nanosecond part of the timestamp is
999999881 ns or greater. |
| 14996 | Detect cases when long(stat_obj.st_mtime) != |
| zmedico | stat_obj[stat.ST_MTIME] due to rounding up, and truncate |
| | digits as necessary to preserve the integral seconds portion |
| | of the mtime. |
| 14997 | Handle permission problems when trying to cache the remote |
| zmedico | Packages file from a binhost. Thanks to Jeremy Olexa |
| | <darkside@g.o> for reporting. |
| 15014 | Don't enable EAPI 4_pre1 yet. |
| zmedico | |
| 15015 | Remove extra comman in comment. |
| zmedico | |
| 15019 | Fix introspection code in fetch() so that it works correctly |
| zmedico | when myuris is an OrderedDict instance. This fixes broken |
| | fetching for some packages. |
svn path=/main/branches/prefix/; revision=15023
Fabian Groffen [Wed, 9 Dec 2009 21:35:33 +0000 (21:35 -0000)]
dodoc somehow slipped through
svn path=/main/branches/prefix/; revision=14994
Fabian Groffen [Wed, 9 Dec 2009 21:19:36 +0000 (21:19 -0000)]
Merged from trunk -r14975:14992
| 14992 | Remove obsolete env-update.sh script. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14993
Fabian Groffen [Wed, 9 Dec 2009 20:11:20 +0000 (20:11 -0000)]
align with trunk
svn path=/main/branches/prefix/; revision=14991
Fabian Groffen [Wed, 9 Dec 2009 20:06:21 +0000 (20:06 -0000)]
EAPI="prefix" is nostalgic, but not reality, make the example read EAPI="3", and update it accordingly
svn path=/main/branches/prefix/; revision=14990
Fabian Groffen [Wed, 9 Dec 2009 20:00:04 +0000 (20:00 -0000)]
drop silly replacement in comment
svn path=/main/branches/prefix/; revision=14989
Fabian Groffen [Wed, 9 Dec 2009 19:59:44 +0000 (19:59 -0000)]
add back chown command from trunk, I hope it won't break
svn path=/main/branches/prefix/; revision=14988
Fabian Groffen [Wed, 9 Dec 2009 19:51:00 +0000 (19:51 -0000)]
De-prefixify this script, since it doesn't look like it's going to work. Actually, this seems to be legacy that needs to be removed, since there is a python version (env-update) that calls the Portage internal implementation, which is of course entirely Prefix aware.
svn path=/main/branches/prefix/; revision=14987
Fabian Groffen [Wed, 9 Dec 2009 19:39:29 +0000 (19:39 -0000)]
I actually checked it out and found this was removed
svn path=/main/branches/prefix/; revision=14986
Fabian Groffen [Wed, 9 Dec 2009 19:38:09 +0000 (19:38 -0000)]
revert prefixication for libtool hack, that's no longer in use
svn path=/main/branches/prefix/; revision=14985
Fabian Groffen [Wed, 9 Dec 2009 19:00:23 +0000 (19:00 -0000)]
Rename --with-default-path into --with-extra-path, since it never completely defines DEFAULT_PATH (it only appends) and we need to ensure that whatever is given always comes as last in the PATH. Added full compatability for non Prefix (trunk) by setting DEFAULT_PATH to the expected value as in trunk when no offset prefix is used.
svn path=/main/branches/prefix/; revision=14984
Fabian Groffen [Wed, 9 Dec 2009 18:30:52 +0000 (18:30 -0000)]
add a little sticky for myself
svn path=/main/branches/prefix/; revision=14983
Fabian Groffen [Wed, 9 Dec 2009 18:25:37 +0000 (18:25 -0000)]
use neutral wording
svn path=/main/branches/prefix/; revision=14982
Fabian Groffen [Wed, 9 Dec 2009 18:19:53 +0000 (18:19 -0000)]
align with prepallinfo
svn path=/main/branches/prefix/; revision=14981
Fabian Groffen [Wed, 9 Dec 2009 18:18:17 +0000 (18:18 -0000)]
avoid cd-ing into ED, which may not exist, omit unnecessary cd at the same time
svn path=/main/branches/prefix/; revision=14980
Fabian Groffen [Wed, 9 Dec 2009 18:03:23 +0000 (18:03 -0000)]
add extra newline, reduce diff with trunk
svn path=/main/branches/prefix/; revision=14979
Fabian Groffen [Wed, 9 Dec 2009 17:55:40 +0000 (17:55 -0000)]
we don't use EPREFIX anywhere in here
svn path=/main/branches/prefix/; revision=14978
Fabian Groffen [Wed, 9 Dec 2009 17:49:51 +0000 (17:49 -0000)]
Merged from trunk -r14969:14975
| 14970 | Don't assign f to sys.stderr inside EOutput._write(). |
| zmedico | |
| 14971 | When temporarily replacing the sys.std* streams, use the |
| zmedico | normal open() func in python3 so that we get the right class |
| | (otherwise our code that expects the 'buffer' attribute will |
| | break). |
| 14972 | Use ImportError handling to import _TextTestResult which |
| zmedico | moved from unittest to unittest.runner in python-2.7. Thanks |
| | to Arfrever for the suggestion. |
| 14973 | Fix handling for TEMP, TMP, and TMPDIR variables: * Add to |
| zmedico | whitelist so current values are always used. * Always filter |
| | them from the saved environment. * Always add thier values |
| | to SANDBOX_WRITE. |
| 14974 | When overridding sys.std* in python2, use binary streams. |
| zmedico | |
| 14975 | Add localization variables (LANG and LC_*) to the |
| zmedico | environment whitelist and filter them from the saved |
| | environment (so user settings override those of binary |
| | packages). Thanks to Fabio Erculiani <lxnay@g.o> for |
| | reporting. |
svn path=/main/branches/prefix/; revision=14977
Fabian Groffen [Wed, 9 Dec 2009 17:48:32 +0000 (17:48 -0000)]
Merged from trunk -r14963:14969
| 14965 | Bump EAPI conditionals to account for rename of EAPI 3 to 4. |
| zmedico | Thanks to Jonathan Callen <abcd@g.o> for this patch. |
| 14966 | Move ebuild helpers to account for rename of EAPI 3 to 4. |
| zmedico | |
| 14967 | Add OrderedDict class. |
| zmedico | |
| 14968 | Use OrderedDict in portdbapi.getFetchMap() so that order in |
| zmedico | $A corresponds to order in SRC_URI. |
| 14969 | When reading the remote Packages file for --getbinpkg, use |
| zmedico | codecs.iterdecode to decode the stream. Also, don't use |
| | finally to close the atomic_ofstream when writing the file |
| | since we want it to abort if an exception is raised. |
svn path=/main/branches/prefix/; revision=14976
Fabian Groffen [Mon, 7 Dec 2009 16:35:33 +0000 (16:35 -0000)]
Merged from trunk -r14950:14963
| 14951 | Fix possibly unsafe modification of list during iteration |
| zmedico | inside update_config_files(). |
| 14953 | Inside dblink._merge(), make sure PORTAGE_BUILDDIR still |
| zmedico | exists before trying to call ebuild success/die hooks, since |
| | it might have already been removed by fail-clean (and the |
| | hooks would have already been called). |
| 14955 | Make more code conditional on existence of PORTAGE_BUILDDIR |
| zmedico | inside dblink._merge(). |
| 14957 | Remove unnecessary elog_process() phasefilter arguements. |
| zmedico | |
| 14958 | Remove unused filter_phases, filter_mergephases, and |
| zmedico | filter_unmergephases functions. |
| 14963 | Copy the unittest._TextTestResult class from python-2.6 |
| zmedico | since it's been removed in python-2.7. |
svn path=/main/branches/prefix/; revision=14964
Fabian Groffen [Sun, 6 Dec 2009 10:34:05 +0000 (10:34 -0000)]
Merged from trunk -r14926:14936
| 14927 | Always append QA Notices resulting from the build log search |
| zmedico | to the end of the log. Thanks to Diego E. Pettenò for |
| | reporting. |
| 14928 | Bug #162404 - Automatically disable logging if sesandbox is |
| zmedico | enabled and a pty is not available for some reason |
| | (currently they are never available with python3). |
| 14929 | Bug #295805 - Fix ValueError with python3 inside |
| zmedico | update_config_files(). |
| 14930 | Move code for handling missing sandbox binary out of the |
| zmedico | config constructor. |
| 14931 | Use portage.StringIO to avoid duplicate import fallback |
| zmedico | code. |
| 14932 | Make register_die_hook() ensure that each hook is registered |
| zmedico | only once. |
| 14933 | Add a AbstractEbuildProcess class for MiscFunctionsProcess |
| zmedico | to inherit the _pipe and _can_log methods that used to be in |
| | the EbuildProcess class. |
| 14934 | Fix _spawn_misc_sh() to properly unset EBUILD_PHASE, and add |
| zmedico | a 'phase' description parameter for use in messages. |
| 14935 | Add 'tla' to the lists of live eclasses. |
| zmedico | |
| 14936 | Bug #295715 - Implement a register_success_hook function to |
| zmedico | complement register_die_hook, and also add code to ensure |
| | the die hooks are called even when the failure is on the |
| | python side (like for file collisions). |
svn path=/main/branches/prefix/; revision=14940
Fabian Groffen [Sun, 6 Dec 2009 10:32:37 +0000 (10:32 -0000)]
Merged from trunk -r14916:14926
| 14921 | Bug #295351 - Make update_dbentries() return unicode if it's |
| zmedico | given unicode, and bytes if it's given bytes. |
| 14922 | Bug #280336, comment #2 - Clear the package selection cache |
| zmedico | when packages are added to the graph. This fixes incorrect |
| | choices that happen in some cases. |
svn path=/main/branches/prefix/; revision=14939
Fabian Groffen [Sun, 6 Dec 2009 10:31:36 +0000 (10:31 -0000)]
Merged from trunk -r14906:14916
| 14907 | Bug #294886 - Show some basic info at the beginning of the |
| zmedico | build log, including USE flags. |
| 14909 | In FakeVartree.sync(), skip the aux_get wrapper when |
| zmedico | populating old-style virtuals, in order to avoid unwanted |
| | cache generation with --nodeps (reported by Arfrever). |
| 14913 | Revert r14901 since it doesn't solve the problem (bug |
| zmedico | #294945). |
| 14914 | Bug #294945 - Fix blocker satistfied state handling inside |
| zmedico | depgraph, to avoid a KeyError when displaying blockers. |
| 14915 | Fix deprecated usage of dep_getkey(). Thanks to Sebastian |
| zmedico | Mingramm (few) for reporting. |
svn path=/main/branches/prefix/; revision=14938
Fabian Groffen [Sun, 6 Dec 2009 10:30:18 +0000 (10:30 -0000)]
Merged from trunk -r14896:14906
| 14897 | In movefile(), skip os.utime() when os.rename() succeeds, in |
| zmedico | order to completely preserve mtime resolution. |
| 14898 | Fix logic from previous commit so it only applies when a |
| zmedico | 'newmtime' parameter has not been specified (this is always |
| | the case when called by portage). |
| 14899 | In calc_depclean(), load the FakeVartree before using it. |
| zmedico | This fixes a regression which causes incomplete graph |
| | creation (since r14773). Thanks to Vlastimil Babka |
| | <caster@g.o> for reporting. |
| 14900 | Add a note about lack of nanosecond precision in movefile(). |
| zmedico | |
| 14901 | Handle a KeyError in depgraph._ordered_tree_display(), |
| zmedico | reported on irc by romildo. |
svn path=/main/branches/prefix/; revision=14937
Fabian Groffen [Thu, 26 Nov 2009 14:21:57 +0000 (14:21 -0000)]
missed the last piece of code that assumes ED exists
svn path=/main/branches/prefix/; revision=14896
Fabian Groffen [Thu, 26 Nov 2009 14:06:35 +0000 (14:06 -0000)]
Merged from trunk -r14884:14886
| 14885 | Use einfo instead of ewarn for the "Skipping make test/check |
| zmedico | due to ebuild restriction." message. |
| 14886 | Set built=True when creating Package instances. This fixes a |
| zmedico | problem with --resume, reported by Sebastian Mingramm (few). |
svn path=/main/branches/prefix/; revision=14895
projects / portage.git / log