Fabian Groffen [Wed, 7 Oct 2009 19:19:22 +0000 (19:19 -0000)]
haubi reported that openpty no longer works on AIX either, so let's finish this and don't do openpty on non-Linux any more. Will port this to trunk.
svn path=/main/branches/prefix/; revision=14514
Fabian Groffen [Wed, 7 Oct 2009 19:14:00 +0000 (19:14 -0000)]
Merged from trunk -r14507:14510
| 14508 | Bug #265267 - Add hint about |
| zmedico | --accept-properties=-interactive in the --jobs docs. |
| 14509 | Use the stricter _pkgsplit function. |
| zmedico | |
| 14510 | Bug #274870: Add file.size.fatal check in repoman. |
| arfrever | |
svn path=/main/branches/prefix/; revision=14513
Fabian Groffen [Wed, 7 Oct 2009 19:12:18 +0000 (19:12 -0000)]
Merged from trunk -r14497:14507
| 14498 | Enable FEATURES=news by default and document it. |
| zmedico | |
| 14499 | When restarting emerge, don't trust sys.argv[0] since |
| zmedico | eselect-python may modify it. |
| 14500 | Add a 'digest.missing' check, for cases like mythtv where |
| zmedico | the eclass has modified the SRC_URI and now the Manifest has |
| | missing digests. Thanks to Brian Harring for the suggestion. |
| 14501 | Add a new --accept-properties option so that users can |
| zmedico | temporarily override ACCEPT_PROPERTIES on the commandline, |
| | without relying on emerge's legacy behavior of allowing |
| | variables to leak in from the calling environment. A typical |
| | usage example for this option would be to use |
| | --accept-properties=-interactive to temporarily mask |
| | interactive packages. With default configuration, this would |
| | result in an effective ACCEPT_PROPERTIES value of "* |
| | -interactive". |
| 14502 | Add a note about --accept-properties and exclusion of |
| zmedico | interactive updates. |
| 14504 | Bug #287870 - Add -r option as short version of --resume. |
| zmedico | |
| 14505 | Fix collision in variable name 'x'. |
| zmedico | |
| 14506 | Exempt installed packages from PROPERTIES masking since the |
| zmedico | user is likely to temporarily alter ACCEPT_PROPERIES in |
| | order to avoid interactive updates and we don't want this to |
| | distort resolver choices or trigger warning messages about |
| | installed packages being masked. |
| 14507 | Bug #265267 - When disabling --jobs due to interactive |
| zmedico | package(s), hint about --accept-properties=-interactive |
| | option. |
svn path=/main/branches/prefix/; revision=14512
Fabian Groffen [Wed, 7 Oct 2009 19:09:55 +0000 (19:09 -0000)]
Merged from trunk -r14487:14497
| 14488 | fix mis-alignment |
| grobian | |
| 14489 | Restrict upstream.workaround to src_compile and src_install |
| volkmar | as much as possible. Prevent warnings when using emake -j1 |
| | in src_test which is recommanded. |
| 14490 | Add src_configure and pkg_config to the list of phases in |
| arfrever | repoman.checks.PhaseCheck.__init__(). |
| 14491 | Make pkgsplit() accept a cpv again, since accepting a pv |
| zmedico | only will probably break lots of api consumers. Thanks to |
| | Romain Perier <mrpouet@g.o> for reporting epkginfo |
| | breakage. |
| 14492 | Use the simpler/stricter _pkgspit in dbapi code. |
| zmedico | |
| 14493 | Use _pkgsplit when input cannot contain a category. |
| zmedico | |
| 14494 | Make pkgsplit() preserve 'null' category if it's present in |
| zmedico | the input. |
| 14495 | Make deprecated_profile_check() suggest to use eselect |
| zmedico | profile. Thanks to Samuli Suominen <ssuominen@g.o> for the |
| | suggestion. |
| 14496 | * Add default ACCEPT_LICENSE and ACCEPT_PROPERTIES values |
| zmedico | in make.globals. * Set default values if missing from |
| | make.globals. * Only warn once if a given license group is |
| | missing. * Prune off any parts of an ACCEPT_LICENSE and |
| | ACCEPT_PROPERTIES that are made irrelevant by the latest |
| | occuring * or -* wildcard. |
| 14497 | - move news into features so it can be ignored when needed. |
| solar | Lots of whitespace cleanups |
svn path=/main/branches/prefix/; revision=14511
Fabian Groffen [Sun, 4 Oct 2009 08:14:46 +0000 (08:14 -0000)]
Merged from trunk -r14484:14485
| 14485 | Generate an eerror message in dblink.mergeme when a file has |
| zmedico | to be renamed in order to merge a directory to the same |
| | path. |
svn path=/main/branches/prefix/; revision=14487
Fabian Groffen [Sat, 3 Oct 2009 21:07:27 +0000 (21:07 -0000)]
- do not calculate source with of isolated-functions (for die function)
as we don't print it
- move paths to the bottom and print ${S} as it's often necessary when a
package fails.
- move error message up directly after the message it says it failed
(printing it below the code snippet usually just repeats the message)
svn path=/main/branches/prefix/; revision=14484
Fabian Groffen [Sat, 3 Oct 2009 20:39:36 +0000 (20:39 -0000)]
use more verbose trace notation from trunk
svn path=/main/branches/prefix/; revision=14481
Fabian Groffen [Sat, 3 Oct 2009 17:28:16 +0000 (17:28 -0000)]
Merged from trunk -r14472:14478
| 14474 | Bug #287333 - If posible, use ebuild from tree when checking |
| zmedico | for keyword mask on installed packages. |
| 14476 | Bug #285832 - When updates are missed due to dependencies |
| zmedico | that have been masked by backtracking, abbreviate output in |
| | order to avoid terminal flooding. |
| 14477 | Don't use a fork inside _test_pty_eof() because it gives |
| zmedico | inconsistent results. |
| 14478 | Fix race condition when using a fork inside _test_pty_eof(). |
| zmedico | |
svn path=/main/branches/prefix/; revision=14480
Fabian Groffen [Sat, 3 Oct 2009 10:08:26 +0000 (10:08 -0000)]
linkmap is already of the right type, instantiating a new object based on that seems to work
svn path=/main/branches/prefix/; revision=14479
Fabian Groffen [Fri, 2 Oct 2009 20:58:01 +0000 (20:58 -0000)]
Resolve conflict, bah
svn path=/main/branches/prefix/; revision=14475
Fabian Groffen [Fri, 2 Oct 2009 20:40:28 +0000 (20:40 -0000)]
Merged from trunk -r14463:14472
| 14465 | Fix SyntaxError with Python 3 added in r14462. |
| arfrever | |
| 14466 | Take regular expressions from portage.dep and use them to |
| zmedico | reimplement portage.versions.pkgsplit(). This simplifies |
| | the code and helps guarantee consistency package |
| | name/version validation. |
| 14467 | Use a regular expression for SLOT validation inside |
| zmedico | vardbapi.aux_get(). |
| 14468 | Bug #286895 - Generate an eerror message when a directory |
| zmedico | blocks merge of a regular file and the file is merged using |
| | a 'config protect' filename even though the path may not be |
| | among those covered by CONFIG_PROTECT. |
| 14469 | Add --tolerant option (already in use on master rsync |
| zmedico | mirror), requested by robbat2. |
| 14470 | Remove libtool from RDEPEND.suspect list, since libltdl.so |
| zmedico | is validly used by some packages at runtime. Thanks to |
| | Samuli Suominen <ssuominen@g.o> for reporting. |
| 14471 | Bug #285191 - Remove the RDEPEND.implicit check because it |
| zmedico | is invalid. |
| 14472 | Bug #287333 - Fix the code from bug #252167 so it behaves |
| zmedico | consistently regardless of the package (ebuild or binpkg) |
| | being masked. |
svn path=/main/branches/prefix/; revision=14473
Fabian Groffen [Tue, 29 Sep 2009 20:29:30 +0000 (20:29 -0000)]
Merged from trunk -r14455:14463
| 14458 | Bug #286780 - Fix email.MIME* imports to use email.mime.* |
| zmedico | (works with python 2.6 and python 3). Thanks to Hanno |
| | Meyer-Thurow <h.mth@web.de> for this patch. |
| 14459 | Don't call self.scan() in tbz2.__init__ since all methods |
| zmedico | call it anyway. |
| 14460 | Make tbz2.get_data() return an empty dict on failure. |
| zmedico | |
| 14461 | Handle encoding/decoding of unicode when using the xpak api. |
| zmedico | Use tbz2.get_data() instead of tbz2.getfile() when reading |
| | multiple values, in order to avoid multiple tbz2.scan() and |
| | searchindex() calls. |
| 14462 | Add back _PackageMetadataWrapper__setitem__, removed in |
| zmedico | r14280, since removing it seems to cause problems. Thanks to |
| | Jeremy Olexa <darkside@gentoo.org> for reporting, and Marat |
| | Radchenko <marat@slonopotamus.org> for bisecting to find the |
| | revision. |
| 14463 | Revert the rest of r14280 since it seems that dict bypasses |
| zmedico | __getitem__ and/or __setitem__ too often. |
svn path=/main/branches/prefix/; revision=14464
Fabian Groffen [Mon, 28 Sep 2009 20:32:37 +0000 (20:32 -0000)]
don't run all those expensice ELF checks on Darwin, it has scanelf, but it doesn't have ELF, make bundle check restrictable
svn path=/main/branches/prefix/; revision=14457
Fabian Groffen [Mon, 28 Sep 2009 18:31:35 +0000 (18:31 -0000)]
Merged from trunk -r14442:14455
| 14445 | Use mkdtemp() instead of hardcoded |
| zmedico | pym/portage/tests/bin/root directory. |
| 14446 | Use explicit imports instead of *. |
| zmedico | |
| 14447 | Fix binTestsInit() to use correct values for |
| zmedico | PORTAGE_BIN_PATH and PORTAGE_PYM_PATH. |
| 14448 | Use catsplit() instead of a regex to generate |
| zmedico | dbapi._categories. Thanks to Marat Radchenko |
| | <marat@slonopotamus.org> for this patch. |
| 14449 | Make _test_pty_eof() use non-blocking IO, required for |
| zmedico | Darwin kernel. |
| 14450 | Fix TypeError in clear_screen() in dispatch-conf which |
| arfrever | occurs when Python 3 is used (bug #286682). |
| 14451 | Make _test_pty_eof() fork when writing to the slave_fd, |
| zmedico | since otherwise it would block on some platforms such as |
| | Darwin. |
| 14452 | In _test_pty_eof(), call waitpid on the child process only |
| zmedico | after reading all the data from the pty. |
| 14453 | Try to avoid blocking on Darwin in _test_pty_eof() by using |
| zmedico | slave_fd directly instead of fdopen. |
| 14454 | Make _test_pty_eof() call process.spawn() instead of |
| zmedico | os.fork(). |
| 14455 | Fix breakage in file path -> package lookup code. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14456
Fabian Groffen [Sun, 27 Sep 2009 09:17:01 +0000 (09:17 -0000)]
Merged from trunk -r14435:14442
| 14442 | Bug #286522 - Check all portdbapi.findname return values in |
| zmedico | case it returns None, and raise 'ebuild not found' |
| | exceptions when necessary. |
svn path=/main/branches/prefix/; revision=14444
Fabian Groffen [Sun, 27 Sep 2009 09:15:05 +0000 (09:15 -0000)]
don't mix ewarn and eqawarn, or the eqawarn messages won't be elogged (and hence repeated at the end)
svn path=/main/branches/prefix/; revision=14443
Fabian Groffen [Sat, 26 Sep 2009 20:48:32 +0000 (20:48 -0000)]
recently added _test_pty_eof does something which makes Darwin hang, so disable openpty now (which used to work fine)
svn path=/main/branches/prefix/; revision=14441
Fabian Groffen [Sat, 26 Sep 2009 18:50:47 +0000 (18:50 -0000)]
ahem, match shebang, not sheone
svn path=/main/branches/prefix/; revision=14440
Fabian Groffen [Sat, 26 Sep 2009 18:46:54 +0000 (18:46 -0000)]
Merged from trunk -r14432:14435
| 14433 | Revert r14430 and fix to do as intended. Thanks to Arfrever |
| zmedico | for reporting. |
| 14435 | Bug #286475 - Fix KeyValuePairFileLoader.lineParser() so it |
| zmedico | doesn't raise AttributeError when a key/value is redefined. |
svn path=/main/branches/prefix/; revision=14439
Fabian Groffen [Sat, 26 Sep 2009 18:46:04 +0000 (18:46 -0000)]
Merged from trunk -r14422:14432
| 14423 | Add a test case for this issue: |
| zmedico | http://bugs.python.org/issue5334 |
| 14424 | Fix length calculation so it doesn't assume the length of |
| zmedico | the encoded string is the same as the unicode string. |
| 14425 | Remove unused imports. |
| zmedico | |
| 14426 | Use imp.reload() instead of reload() for compatibility with |
| arfrever | Python 3. |
| 14427 | Define __bool__() for compatibility with Python 3. |
| arfrever | |
| 14428 | Remove ugly code from __len__, since defining __bool__ |
| zmedico | fixes the same issue. |
| 14429 | Fix formatting of sizes with Python 3. |
| arfrever | |
| 14430 | Make sure self._allowed_keys are sorted in the table create |
| zmedico | statement. They already are sorted, but do it explicitly |
| | here for clarity. |
| 14431 | Fix UnboundLocalError triggered by atom without category |
| zmedico | for nonexistent package. Thanks to Jeremy Olexa |
| | <darkside@gentoo.org> for reporting. |
| 14432 | Bug #285767 - Add support to to identify and eliminate |
| zmedico | redundant package selections when multiple atoms happen to |
| | specify a version range. |
svn path=/main/branches/prefix/; revision=14438
Fabian Groffen [Sat, 26 Sep 2009 18:44:55 +0000 (18:44 -0000)]
Merged from trunk -r14412:14422
| 14413 | Use a runtime check to see if |
| zmedico | http://bugs.python.org/issue5380 is fixed. |
| 14414 | Make _test_pty_eof() return None if openpty() fails. |
| zmedico | |
| 14415 | Add a test case for http://bugs.python.org/issue5380 and |
| zmedico | mark it as 'todo' since it fails with current versions of |
| | python 3. |
| 14416 | Fix regression in _getitem() from r14398, since |
| zmedico | myf.read().split("\n") yields an empty string at the end |
| | which is causes _parse_data() to catch a ValueError and |
| | raise CacheCorruption. |
| 14417 | Show an appropriate error message in _create_pty_or_pipe() |
| zmedico | if openpty() fails inside _test_pty_eof(). |
| 14418 | Remove unnecessary dict.has_key() call (fix for python 3). |
| zmedico | |
| 14419 | Fix ValueError in digestcheck(), reported by Arfrever. |
| zmedico | |
| 14420 | Fix more. |
| zmedico | |
| 14421 | Use list comprehensions instead of filter() or map() in |
| arfrever | some places for compatibility with Python 3. |
| 14422 | Use 'in' instead of has_key() in portage.glsa.Glsa.parse() |
| arfrever | when Python 3 is used. |
svn path=/main/branches/prefix/; revision=14437
Fabian Groffen [Sat, 26 Sep 2009 18:43:40 +0000 (18:43 -0000)]
Merged from trunk -r14402:14412
| 14412 | Use dict.__iter__ instead of keys(), since it behaves |
| zmedico | identically in python 2 and 3. |
svn path=/main/branches/prefix/; revision=14436
Fabian Groffen [Thu, 24 Sep 2009 18:34:43 +0000 (18:34 -0000)]
Fix syntax
svn path=/main/branches/prefix/; revision=14411
Fabian Groffen [Thu, 24 Sep 2009 18:23:22 +0000 (18:23 -0000)]
Make shebang check only fatal on scripts that are located in PATH, warn for those outside, as suggested by mduft and darkside. Turn the latter warn in a die too when FEATURES=stricter as suggeste by darkside and ulm.
svn path=/main/branches/prefix/; revision=14410
Fabian Groffen [Thu, 24 Sep 2009 18:12:57 +0000 (18:12 -0000)]
don't throw away etc/init.d/functions.sh as that causes misc misery
svn path=/main/branches/prefix/; revision=14409
Fabian Groffen [Thu, 24 Sep 2009 17:53:01 +0000 (17:53 -0000)]
fix case were the end of the file matches the start of magic, thanks Markus Duft for the report
svn path=/main/branches/prefix/; revision=14408
Fabian Groffen [Thu, 24 Sep 2009 17:28:17 +0000 (17:28 -0000)]
Merged from trunk -r14396:14402
| 14397 | Fix test case for recent changes. |
| zmedico | |
| 14398 | Misc performance enhancements. Thanks to Marat Radchenko |
| zmedico | <marat@slonopotamus.org> for this patch from bug #276813. |
| 14399 | Decode directory names where appropriate in digestcheck(). |
| zmedico | Thanks to Arfrever for reporting. |
| 14400 | Avoid unicode errors in python 3. Thanks to Arfrever for |
| zmedico | reporting. |
| 14401 | Warn if cpv_getkey() is given invalid input that triggers |
| zmedico | legacy code. |
| 14402 | Fix previous commit. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14407
Fabian Groffen [Thu, 24 Sep 2009 17:26:52 +0000 (17:26 -0000)]
Merged from trunk -r14388:14396
| 14389 | Fix stack_dicts() to always return a dict. |
| zmedico | |
| 14390 | Make SlotDict use call self.iteritems() where appropriate |
| zmedico | since it implements that method even when running in python |
| | 3.x. |
| 14391 | Optimize SlotDict.iteritems() a little. |
| zmedico | |
| 14392 | Optimize vardbapi.getpath(). Thanks to Marat Radchenko |
| zmedico | <marat@slonopotamus.org> for this patch. |
| 14393 | Bug #285979 - Replace references to CDEPEND with UNUSED_00, |
| zmedico | to make it clear that this key really is unused. |
| 14394 | Fix formatting of size of downloads with Python 3. |
| arfrever | |
| 14395 | Fix "TypeError: object of type 'filter' has no len()". |
| arfrever | |
| 14396 | Bug #286118 - Fix dbapi.move_ent() methods so they don't |
| zmedico | assume Atom instances can be concatenated with strings |
| | (even though they can now, it's not really a good |
| | assumption). |
svn path=/main/branches/prefix/; revision=14406
Fabian Groffen [Thu, 24 Sep 2009 17:25:35 +0000 (17:25 -0000)]
Merged from trunk -r14378:14388
| 14379 | Replace doct.keys() usage with __iter__(), since it behaves |
| zmedico | identically in both python 2.x and 3.x. |
| 14380 | Replace dict.keys() usage with __iter__(), since it behaves |
| zmedico | identically in both python 2.x and 3.x. |
| 14381 | Fix for python 3.x compatibility. |
| zmedico | |
| 14382 | Replace dict.keys() usage with __iter__(), since it behaves |
| zmedico | identically in both python 2.x and 3.x. |
| 14383 | Remove code that's been commented out. |
| zmedico | |
| 14384 | Replace dict.keys() usage with __iter__(), since it behaves |
| zmedico | identically in both python 2.x and 3.x. |
| 14385 | Replace dict.keys() usage with __iter__(), since it behaves |
| zmedico | identically in both python 2.x and 3.x. |
| 14386 | Disable the ignore_none parameter for stack_dicts() since |
| zmedico | having it return None instead of a dict sometimes is |
| | hazardous. |
| 14387 | Clean up stack_dicts() a little. |
| zmedico | |
| 14388 | Don't pass the ignore_none parameter to stack_dicts() since |
| zmedico | it does nothing now. |
svn path=/main/branches/prefix/; revision=14405
Fabian Groffen [Thu, 24 Sep 2009 17:24:01 +0000 (17:24 -0000)]
Merged from trunk -r14368:14378
| 14369 | Don't wrap os.statvfs since it requires unicode string args |
| zmedico | in py3k. |
| 14370 | Fix 'RuntimeError: dictionary changed size during iteration' |
| zmedico | in _owners_db._populate() with py3k. |
| 14371 | Fix items to prevent infinite recursion. |
| zmedico | |
| 14372 | Remove redundant list() since starred expressions work with |
| zmedico | iterators. |
| 14373 | Fix 'RuntimeError: dictionary changed size during iteration' |
| zmedico | in bindbapi.aux_update() with py3k. |
| 14374 | Fix 'iteritems' attribute detection to look for 'items' |
| zmedico | instead. |
| 14375 | Fix another potential 'RuntimeError: dictionary changed size |
| zmedico | during iteration' exception in _owners_db._populate() for |
| | py3k. |
| 14376 | Optimize unicode wrappers. Thanks to Marat Radchenko |
| zmedico | <marat@slonopotamus.org> for this patch from bug #276813. |
| 14377 | For python 3.x with boolean target, len() results in |
| zmedico | TypeError, so make __len__ return 0 or 1 in this case. |
| 14378 | Do manual unicode handling (instead of using the wrapped os |
| zmedico | module) in portdbapi.findname2(), since it's a hotspot. |
| | Thanks to Marat Radchenko <marat@slonopotamus.org> for the |
| | initial patch. |
svn path=/main/branches/prefix/; revision=14404
Fabian Groffen [Thu, 24 Sep 2009 17:22:25 +0000 (17:22 -0000)]
Merged from trunk -r14358:14368
| 14361 | Fix decodeint() for py3k compat, since bytes are a sequence |
| zmedico | of integers instead of characters. |
| 14362 | Temporarily disable use of pty in py3k since it triggers an |
| zmedico | unresolved issue, http://bugs.python.org/issue5380. With |
| | this workaround, |
| | portage.tests.ebuild.test_spawn.SpawnTestCase.testLogfile() |
| | does not raise IOError. |
| 14363 | Don't encode the env in py3k since it expects strings for |
| zmedico | the env that's passed into os.execve(). |
| 14364 | Make find_binary() use os.environ.get instead of os.getenv, |
| zmedico | since os.getenv isn't behaving correctly in py3k (maybe a |
| | unicode wrapper issue?). |
| 14365 | Fix PORTAGE_WORKDIR_MODE parsing code so it doesn't store |
| zmedico | python's octal syntax in the environment variable. |
| 14366 | In _unicode_func_wrapper, only encode keyword argument |
| zmedico | values, and not the keys. |
| 14367 | Encode/decode names from the xpak index where appropriate. |
| zmedico | |
| 14368 | Fix sorted() keyword arg for py3k. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14403
Fabian Groffen [Mon, 21 Sep 2009 19:26:47 +0000 (19:26 -0000)]
Merged from trunk -r14354:14358
| 14355 | Use next(iterator) instead of iterator.next() for |
| arfrever | compatibility with Python 3. (2to3-3.1 -f next -nw |
| | ${FILES}) |
| 14357 | Decode database name passed to |
| arfrever | portage.cache.sqlite.database._db_module.connect() for |
| | compatibility with Python 3. |
| 14358 | Use input() instead of raw_input() when Python 3 is used. |
| arfrever | |
svn path=/main/branches/prefix/; revision=14360
Fabian Groffen [Mon, 21 Sep 2009 19:00:57 +0000 (19:00 -0000)]
do print transformations that 2to3 doesn't seem to catch
svn path=/main/branches/prefix/; revision=14359
Fabian Groffen [Mon, 21 Sep 2009 18:14:26 +0000 (18:14 -0000)]
Merged from trunk -r14343:14352
| 14347 | 'filtered_auxdbkeys' should be a list to allow sorting. |
| arfrever | |
| 14352 | Decode all keys in dictionary containing environment passed |
| arfrever | to os.execve() in portage.process._exec() for compatibility |
| | with Python 3. |
svn path=/main/branches/prefix/; revision=14356
Fabian Groffen [Mon, 21 Sep 2009 18:10:00 +0000 (18:10 -0000)]
Merged from trunk -r14333:14343
| 14343 | Define long as int when Python 3 is used. |
| arfrever | |
svn path=/main/branches/prefix/; revision=14354
Fabian Groffen [Mon, 21 Sep 2009 18:05:00 +0000 (18:05 -0000)]
Merged from trunk -r14327:14333
| 14328 | Fix infinite recursion in items and values methods. |
| zmedico | |
| 14329 | Fix infinite recursion in items and values methods. |
| zmedico | |
| 14330 | Fix dep_expand so that it doesn't use deprecated |
| zmedico | dep_getcpv() usage (with missing category). |
| 14331 | Fix portage._unicode_func_wrapper.__call__() to properly |
| arfrever | handle bytes with Python 3. |
| 14333 | Support bytes in portage.util.normalize_path() with Python |
| arfrever | 3. |
svn path=/main/branches/prefix/; revision=14353
Fabian Groffen [Mon, 21 Sep 2009 17:59:02 +0000 (17:59 -0000)]
Merged from trunk -r14326:14327
| 14327 | Use dict.(keys|values|items)() instead of |
| arfrever | dict.(iterkeys|itervalues|iteritems)() for compatibility |
| | with Python 3. (2to3-3.1 -f dict -nw ${FILES}) |
svn path=/main/branches/prefix/; revision=14351
Fabian Groffen [Mon, 21 Sep 2009 17:52:39 +0000 (17:52 -0000)]
Merged from trunk -r14317:14326
| 14318 | Add deprecation warnings to vartree.exists_specific_cat(), |
| zmedico | getnode(), and hasnode(). Use dbapi methods instead. |
| 14319 | Make key_expand() always return Atom type. |
| zmedico | |
| 14320 | Use dep_expand instead of key_expand in the blocker |
| zmedico | display, since it seems like a better fit. Also, use |
| | str(atom) since we don't want to assume that Atoms are |
| | string type (though they happen to be now). This assumption |
| | is what caused the traceback in bug 285637, comment #5. |
| 14321 | Support both Python 2 and 3 in portage._unicode_encode() |
| arfrever | and portage._unicode_decode(). Update decoding in some |
| | files. |
| 14322 | Deprecate key_expand and |
| zmedico | portage.dbapi.porttree.portagetree.resolve_specific which |
| | calls it. |
| 14323 | Fix breakage in _unicode_encode() for non-string types. |
| zmedico | |
| 14324 | Show deprecation warnings when dep_* legacy code is |
| zmedico | triggered. |
| 14325 | Simplify match_to_list(). Thanks to Marat Radchenko |
| zmedico | <marat@slonopotamus.org> for this patch from bug #276813. |
| 14326 | Fix case for 0 args in args unicode conversion. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14350
Fabian Groffen [Mon, 21 Sep 2009 17:51:11 +0000 (17:51 -0000)]
Merged from trunk -r14316:14317
| 14317 | Use range() instead of xrange() for compatibility with |
| arfrever | Python 3. (2to3-3.1 -f xrange -nw ${FILES}) |
svn path=/main/branches/prefix/; revision=14349
Fabian Groffen [Mon, 21 Sep 2009 17:48:54 +0000 (17:48 -0000)]
Merged from trunk -r14315:14316
| 14316 | Define basestring as str when Python 3 is used. |
| arfrever | |
svn path=/main/branches/prefix/; revision=14348
Fabian Groffen [Mon, 21 Sep 2009 17:46:12 +0000 (17:46 -0000)]
Merged from trunk -r14314:14315
| 14315 | Fix all remaining SyntaxErrors with Python 3. |
| arfrever | |
svn path=/main/branches/prefix/; revision=14346
Fabian Groffen [Mon, 21 Sep 2009 17:45:06 +0000 (17:45 -0000)]
Merged from trunk -r14313:14314
| 14314 | Use filter() and zip() instead of itertools.ifilter() and |
| arfrever | itertools.izip() for compatibility with Python 3. (2to3-3.1 |
| | -f itertools -f itertools_imports -nw ${FILES}) |
svn path=/main/branches/prefix/; revision=14345
Fabian Groffen [Mon, 21 Sep 2009 17:43:04 +0000 (17:43 -0000)]
Merged from trunk -r14306:14313
| 14307 | Fix typos in http.client imports. |
| zmedico | |
| 14308 | Remove virtuals from the cache because they're unused since |
| zmedico | portage-2.1.6 and it won't hurt older portage. |
| 14309 | Fix redundant Atom construtor call in |
| zmedico | _show_unsatisfied_dep(). |
| 14310 | Tread blockers as invalid. |
| zmedico | |
| 14311 | Fix AtomArg constructor calls to pass in Atom instances, so |
| zmedico | the constructor never has to construct one. |
| 14312 | When generating config.prevmaskdict, only call the Atom |
| zmedico | constructor when necessary. |
| 14313 | Make Atom.__init__ call the base class constructor, though |
| zmedico | it doesn't seem to matter. |
svn path=/main/branches/prefix/; revision=14344
Fabian Groffen [Mon, 21 Sep 2009 17:41:37 +0000 (17:41 -0000)]
Merged from trunk -r14296:14306
| 14297 | Add back a line which I erroneously removed when committing |
| zmedico | the patch for bug 203733. Thanks to Alexis Ballier |
| | <aballier@g.o> for reporting the related KeyError. |
| 14298 | In doebuild_environment(), detect if setcpv() hasn't been |
| zmedico | called properly, and call it if necessary (mainly for api |
| | consumers). |
| 14299 | Make _unicode_module_wrapper cache wrappers and reuse them. |
| zmedico | Thanks to Marat Radchenko <marat@slonopotamus.org> for this |
| | patch from bug #276813. |
| 14300 | Make Atom inherit from str. Thanks to Marat Radchenko |
| zmedico | <marat@slonopotamus.org> for this patch from bug #276813. |
| 14301 | Use _unicode_encode() to ensure that only unicode strings |
| zmedico | are passed into io.StringIO text streams. |
| 14302 | Misc unicode fixes for repoman. |
| zmedico | |
| 14303 | Add support in ConsoleStyleFile.write() for unicode encoding |
| zmedico | when writing to stdout/stderr in python-2.x. |
| 14304 | Add fallback in ImportError for io.StringIO. This is needed |
| zmedico | for python-2.6 with USE=build since io imports threading |
| | which imports thread which is unavailable. |
| 14305 | Fix depgraph._validate_blockers() so that it doesn't do |
| zmedico | prohibited Atom(Atom) constructor calls. |
| 14306 | Fix typo from previous commit. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14342
Fabian Groffen [Mon, 21 Sep 2009 17:39:25 +0000 (17:39 -0000)]
Merged from trunk -r14295:14296
| 14296 | Fix position of imports from __future__. |
| arfrever | |
svn path=/main/branches/prefix/; revision=14341
Fabian Groffen [Mon, 21 Sep 2009 17:35:18 +0000 (17:35 -0000)]
Merged from trunk -r14294:14295
| 14295 | Support print() function with Python 2 in more files. |
| arfrever | |
svn path=/main/branches/prefix/; revision=14340
Fabian Groffen [Mon, 21 Sep 2009 17:32:15 +0000 (17:32 -0000)]
Merged from trunk -r14293:14294
| 14294 | Update system imports for compatibility with Python 3. |
| arfrever | |
svn path=/main/branches/prefix/; revision=14339
Fabian Groffen [Mon, 21 Sep 2009 17:25:19 +0000 (17:25 -0000)]
Merged from trunk -r14291:14293
| 14292 | Update syntax of numbers for compatibility with Python 3. |
| arfrever | (2to3-3.1 -f numliterals -nw ${FILES}) |
| 14293 | Update syntax of numbers in some files which were missing |
| arfrever | in previous commit. |
svn path=/main/branches/prefix/; revision=14338
Fabian Groffen [Mon, 21 Sep 2009 17:22:22 +0000 (17:22 -0000)]
Merged from trunk -r14290:14291
| 14291 | Support print() function with Python 2 in some files. |
| arfrever | |
svn path=/main/branches/prefix/; revision=14337
Fabian Groffen [Mon, 21 Sep 2009 17:19:05 +0000 (17:19 -0000)]
Merged from trunk -r14289:14290
| 14290 | Update syntax of calls to print() for compatibility with |
| arfrever | Python 3. (2to3-3.1 -f print -nw ${FILES}) |
svn path=/main/branches/prefix/; revision=14336
Fabian Groffen [Mon, 21 Sep 2009 17:10:32 +0000 (17:10 -0000)]
Merged from trunk -r14288:14289
| 14289 | Update syntax of 'except' statements for compatibility with |
| arfrever | Python 3. (2to3-3.1 -f except -nw ${FILES}) |
svn path=/main/branches/prefix/; revision=14335
Fabian Groffen [Mon, 21 Sep 2009 17:07:18 +0000 (17:07 -0000)]
Merged from trunk -r14284:14288
| 14285 | Fix config.setinst() to add Atom instances to the provider |
| zmedico | lists instead of plain str. |
| 14286 | Add isinstance(mydep, Atom) checks to the dep_* functions |
| zmedico | since we don't use a metaclass to do that anymore (due to |
| | performance). |
| 14288 | Bug #285637 - Fix NameError exception triggered by |
| zmedico | InvalidAtom in grabfile_package(). |
svn path=/main/branches/prefix/; revision=14334
Fabian Groffen [Mon, 21 Sep 2009 17:02:37 +0000 (17:02 -0000)]
Merged from trunk -r14274:14284
| 14279 | Atom optimizations. Remove the metaclass and cache since it |
| zmedico | just slows it down. Thanks to Marat Radchenko |
| | <marat@slonopotamus.org> for this patch. |
| 14280 | Use a dict for Package.metadata, because it's faster. Thanks |
| zmedico | to Marat Radchenko <marat@slonopotamus.org> for this patch |
| | from bug #276813. |
| 14281 | Fix _expand_new_virtuals() to preserve USE deps in atoms for |
| zmedico | new-style virtuals, and update the corresponding depgraph |
| | code. |
| 14282 | Avoid lots of redundant Atom constructor calls. Thanks to |
| zmedico | Marat Radchenko <marat@slonopotamus.org> for the initial |
| | patch from bug #276813. |
| 14283 | Remove obsolete InvalidAtom handler in |
| zmedico | _add_pkg_dep_string(). |
| 14284 | Revert accidental changes |
| zmedico | _unicode_module_wrapper.__getattribute__ from previous |
| | commit. |
svn path=/main/branches/prefix/; revision=14332
Fabian Groffen [Wed, 16 Sep 2009 19:04:34 +0000 (19:04 -0000)]
Deal with spaces, especially OSX loves them
svn path=/main/branches/prefix/; revision=14278
Fabian Groffen [Wed, 16 Sep 2009 18:13:39 +0000 (18:13 -0000)]
Merged from trunk -r14270:14274
| 14271 | Make depgraph._select_atoms() return a dict, in order to |
| zmedico | separate selected direct deps from indirect virtual deps. |
| 14272 | Add support in depgraph._add_pkg_dep_string() for adding |
| zmedico | indirect virtual deps to the graph. This takes advantage of |
| | circular dependency avoidance that's done by dep_zapdeps, |
| | while avoiding the dependency graph distortion reported in |
| | bug #283795. |
| 14273 | Fix broken virtual depth code from previous commit. |
| zmedico | |
| 14274 | Update documentation of inherit. Reported by Jeremy Olexa. |
| arfrever | |
svn path=/main/branches/prefix/; revision=14277
Fabian Groffen [Wed, 16 Sep 2009 18:12:43 +0000 (18:12 -0000)]
Merged from trunk -r14256:14270
| 14259 | Use a regular expression for cpv_getkey(), and fall back to |
| zmedico | legacy code if no match is found. |
| 14261 | Insice match_from_list(), use remove_slot() instead of |
| zmedico | dep_getcpv() where appropriate. |
| 14262 | Make dep_getcpv() use Atom, and fall back to legacy code for |
| zmedico | backward compat. |
| 14264 | Simplify cpv_getkey() by just calling dep_getkey('=' + |
| zmedico | mycpv). |
| 14269 | Reimplement the code from bug #283795 so that indirect deps |
| zmedico | are preserved for later use. TODO: Write code to add |
| | selected indirect virtual deps to the graph. This will take |
| | advantage of circular dependency avoidance that's done by |
| | dep_zapdeps. |
| 14270 | When _expand_new_virtuals() is called by repoman, skip |
| zmedico | expansion of new-style virtuals. |
svn path=/main/branches/prefix/; revision=14276
Fabian Groffen [Wed, 16 Sep 2009 18:11:06 +0000 (18:11 -0000)]
only look for executables, that makes more sense and removes a lot of matches, with this reduction we no longer need to ignore usr/share/doc (in theory)
svn path=/main/branches/prefix/; revision=14275
Fabian Groffen [Mon, 14 Sep 2009 11:01:20 +0000 (11:01 -0000)]
Remove now stray comment
svn path=/main/branches/prefix/; revision=14268
Fabian Groffen [Mon, 14 Sep 2009 10:59:46 +0000 (10:59 -0000)]
automatically fix shebangs where possible as the number of problems is too big to fix them all in the ebuilds
svn path=/main/branches/prefix/; revision=14267
Fabian Groffen [Mon, 14 Sep 2009 09:50:41 +0000 (09:50 -0000)]
avoid many false positives
svn path=/main/branches/prefix/; revision=14266
Fabian Groffen [Mon, 14 Sep 2009 09:39:25 +0000 (09:39 -0000)]
remove /etc/{init,conf}.d stuff until we fix bug #196294
svn path=/main/branches/prefix/; revision=14265
Fabian Groffen [Mon, 14 Sep 2009 08:22:09 +0000 (08:22 -0000)]
kill some false positives in documentation
svn path=/main/branches/prefix/; revision=14263
Fabian Groffen [Mon, 14 Sep 2009 07:53:17 +0000 (07:53 -0000)]
Merged from trunk -r14250:14256
| 14251 | Simplify the _pkg regex and fix validation for some cases by |
| zmedico | using the _version regex to match unwanted version-like |
| | components which can not be at the end of a _pkg match. For |
| | example isvalidatom('app-doc/php-docs-
20071125-r2') now |
| | correctly returns False. |
| 14252 | Simplify isvalidatom() to simply use the Atom class. Thanks |
| zmedico | to Marat Radchenko <marat@slonopotamus.org> for the |
| | suggestion. |
| 14253 | Add more test cases. |
| zmedico | |
| 14254 | Use the Atom class to implement dep_getkey(), and fall back |
| zmedico | to legacy code when necessary for backward compatibility. |
| 14255 | Make isspecific() use the Atom class and fall back to legacy |
| zmedico | code if the atom is invalid. Also, optimize called |
| | isjustname() legacy code to only check the last 2 |
| | components. |
| 14256 | Make get_operator() use Atom, and remove unnecessary |
| zmedico | reflection code from dep_getkey(). Thanks to Marat Radchenko |
| | <marat@slonopotamus.org> for suggestions. |
svn path=/main/branches/prefix/; revision=14260
Fabian Groffen [Mon, 14 Sep 2009 07:52:07 +0000 (07:52 -0000)]
Merged from trunk -r14242:14249
| 14249 | Simlify the Atom regex. Thanks to Marat Radchenko |
| zmedico | <marat@slonopotamus.org> for this patch. |
svn path=/main/branches/prefix/; revision=14258
Fabian Groffen [Mon, 14 Sep 2009 07:46:54 +0000 (07:46 -0000)]
add shebang check, bug #282539
svn path=/main/branches/prefix/; revision=14257
Fabian Groffen [Sun, 13 Sep 2009 19:14:16 +0000 (19:14 -0000)]
Context:
http://archives.gentoo.org/gentoo-alt/msg_2d3dfb3888ac4dcd4e64e1539ef039ff.xml
Let Portage not be tricked by symlinks when determining whether to
remove a directory. This solves the case where the user added symlink
in place of the original directory and Portage would unmerge the
symlink. With this patch Portage detects it is not dealing with a
directory but a symlink. I think this is what was originally intended
in this code. zmedico should give it a thorough look before merging
back to trunk.
svn path=/main/branches/prefix/; revision=14248
Fabian Groffen [Sun, 13 Sep 2009 19:05:11 +0000 (19:05 -0000)]
Merged from trunk -r14239:14242
| 14240 | Fix docs for isjustname() since it doesn't raise InvalidAtom |
| zmedico | now. |
| 14241 | Make the Atom constructor use regular expression match |
| zmedico | groups for initialization. Thanks to Marat Radchenko |
| | <marat@slonopotamus.org> for this patch. |
| 14242 | Use cpv_getkey() instead of dep_getkey() where appropriate. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14247
Fabian Groffen [Sun, 13 Sep 2009 19:03:52 +0000 (19:03 -0000)]
Merged from trunk -r14229:14239
| 14230 | Make parse_updates() and update_dbentry() use Atom |
| zmedico | instances. |
| 14231 | Add missing InvalidAtom import. |
| zmedico | |
| 14232 | Make dbapi.move_ent() take advantage of Atom instances when |
| zmedico | validating arguments. |
| 14233 | In config.getvirtuals(), save Atom instances in order to |
| zmedico | avoid revalidation. Also, fix cpv_expand() to handle Atom |
| | instances from config.getvirtuals(). |
| 14234 | Reimplement isjustname() using the Atom class. Thanks to |
| zmedico | Marat Radchenko <marat@slonopotamus.org> for the suggestion. |
| 14235 | Fix isjustname docstring to have a valid atom in the |
| zmedico | example. |
| 14236 | Use isjustname() where appropriate. |
| zmedico | |
| 14237 | Fix bug in _expand_new_virtuals() reported by Arfrever: |
| zmedico | TypeError: coercing to Unicode: need string or buffer, Atom |
| | found |
| 14238 | Add tests for the Atom class. |
| zmedico | |
| 14239 | Add backward compatibility to isjustname(), so the tests |
| zmedico | don't fail. |
svn path=/main/branches/prefix/; revision=14246
Fabian Groffen [Sun, 13 Sep 2009 19:02:13 +0000 (19:02 -0000)]
Merged from trunk -r14219:14229
| 14220 | Add test case for * operator with missing =. |
| zmedico | |
| 14221 | Add test cases for operators with missing version component. |
| zmedico | |
| 14222 | Bug #257660 - Handle directories that are unlisted in |
| zmedico | Entries, which is normal when checked out without -P. Thanks |
| | to Christian Ruppert <idl0r@gentoo.org> for this patch. |
| 14223 | Implement Atom.__copy__ and __deepcopy__ to return self, |
| zmedico | since instances are immutable. |
| 14224 | Make grabdict_package() and grabfile_package() return Atom |
| zmedico | instances when possible, in order to avoid revalidation. |
| 14225 | Make grabfile_package() accept *atom only for files named |
| zmedico | 'packages' since they are not valid in any other files. |
| 14226 | Update grabdict_package and grabfile_package calling code to |
| zmedico | take advantage of Atom instances, and convert *atom from |
| | 'packages' to a normal Atom instance when it's stored in |
| | prevmaskdict. |
| 14227 | Fix bugs and poor assumptions. |
| zmedico | |
| 14228 | Fix poor assumptions. |
| zmedico | |
| 14229 | Fix bad assumptions. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14245
Fabian Groffen [Sun, 13 Sep 2009 19:01:10 +0000 (19:01 -0000)]
Merged from trunk -r14209:14219
| 14210 | In catpkgsplit(), use split('/', 1) since there should never |
| zmedico | be more than on slash to split. |
| 14211 | Optimize catpkgsplit() by creating a tuple directly instead |
| zmedico | of generating it from a list. Thanks to Marat Radchenko |
| | <slonopotamusorama@gmail.com> for this patch. |
| 14212 | Bug #283795 - Make dep_check() filter out expanded indirect |
| zmedico | virual deps after they are no longer needed, in order to |
| | avoid distortion of the depgraph. |
| 14213 | Reimplement isvalidatom() to use a single regular expression |
| zmedico | match. Thanks to Marat Radchenko <marat@slonopotamus.org> |
| | for this patch from bug #276813. |
| 14214 | In debug mode, avoid showing gcc QA search strings in the |
| zmedico | trace, so they won't trigger false positives. Thanks to Amit |
| | Dor-Shifer <amitds@oversi.com> for reporting. |
| 14215 | Fix code from previous commit so it's guaranteed to always |
| zmedico | properly reset debug state. |
| 14216 | Fix isvalidatom() to check the 'must not end in' clause from |
| zmedico | PMS 2.1.2. Thanks to Marat Radchenko |
| | <marat@slonopotamus.org> for this patch. |
| 14217 | Reimplement isspecific() using a single regular expression |
| zmedico | match. Thanks to Marat Radchenko <marat@slonopotamus.org> |
| | for this patch. |
| 14218 | Fix false positives in gcc QA with debug mode some more. |
| zmedico | Thanks again to Amit Dor-Shifer <amitds@oversi.com> for |
| | reporting. |
| 14219 | simplify atom regex (winning even more performance) and |
| zmedico | turns it in verbose mode with comments. Added more corner |
| | case tests. Thanks to Marat Radchenko |
| | <marat@slonopotamus.org> for this patch from bug #276813. |
svn path=/main/branches/prefix/; revision=14244
Fabian Groffen [Sun, 13 Sep 2009 18:56:52 +0000 (18:56 -0000)]
Merged from trunk -r14200:14209
| 14201 | Use _unicode_decode() on the string returned from |
| zmedico | time.strftime(), in order to avoid a potential |
| | UnicodeDecodeError later. Thanks to Markus Duft |
| | <mduft@gentoo.org> for reporting. |
| 14202 | Inside Scheduler._check_manifests(), display all broken |
| zmedico | manifests instead of returning after the first one. Thanks |
| | to Vlastimil Babka <caster@g.o> for the suggestion. |
| 14203 | Add a vardbapi._pkgs_changed attribute to use instead of |
| zmedico | PORTAGE_COUNTER_HASH for emerge to check whether any |
| | packages have been added/removed. This is an optimization, |
| | since vardbapi._counter_hash() can be somewhat slow on |
| | embedded systems. Thanks to Marat Radchenko |
| | <slonopotamusorama@gmail.com> for reporting. |
| 14204 | Add ACCEPT_LICENSE and ACCEPT_PROPERTIES to the Packages |
| zmedico | file header. |
| 14205 | Document ACCEPT_LICENSE and package.license. |
| zmedico | |
| 14206 | Document ACCEPT_PROPERTIES and package.properties. |
| zmedico | |
| 14207 | Remove unused vardbapi._counter_hash() method. |
| zmedico | |
| 14208 | In display_news_notification(), use the exising vartree |
| zmedico | instance to populate settings.treeVirtuals, to avoid having |
| | a temporary one instantiated. Thanks to Marat Radchenko |
| | <slonopotamusorama@gmail.com> for reporting. |
| 14209 | Handle AttributeError instead of using getattr. Thanks to |
| zmedico | Marat Radchenko <slonopotamusorama@gmail.com> for reporting. |
svn path=/main/branches/prefix/; revision=14243
Fabian Groffen [Sat, 5 Sep 2009 13:36:07 +0000 (13:36 -0000)]
Merged from trunk -r14198:14199
| 14199 | DEPCACHE_PATH is not used with ROOT at all, so move it out |
| grobian | of the target_root variable group |
svn path=/main/branches/prefix/; revision=14200
Fabian Groffen [Sat, 5 Sep 2009 11:15:48 +0000 (11:15 -0000)]
Merged from trunk -r14196:14197
| 14197 | pym/portage/sets/files.py: use WORLD_FILE instead of manual |
| grobian | reconstruction pym/portage/const.py: introduce |
| | WORLD_SETS_FILE variable pym/portage/sets/files.py: use new |
| | WORLD_SETS_FILE var pym/_emerge/unmerge.py: likewise |
svn path=/main/branches/prefix/; revision=14198
Fabian Groffen [Sat, 5 Sep 2009 11:06:05 +0000 (11:06 -0000)]
PRIVATE_PATH is used with ROOT, so it should include EPREFIX
svn path=/main/branches/prefix/; revision=14196
Fabian Groffen [Sat, 5 Sep 2009 11:00:20 +0000 (11:00 -0000)]
Merged from trunk -r14186:14191
| 14187 | Fix usage of VDB_PATH |
| grobian | |
| 14188 | consistently use CACHE_PATH with target_root, this commit |
| grobian | needs a separate soon to be done commit of |
| | pym/portage/const.py to work correctly |
| 14189 | PRIVATE_PATH has no leading slash (like all other uses of |
| grobian | this var assume) |
| 14190 | add note that this file does not seem to deal with ROOT at |
| grobian | all |
| 14191 | DEPRECATED_PROFILE_FILE is derived from PROFILE_PATH which |
| grobian | has no leading slash |
svn path=/main/branches/prefix/; revision=14195
Fabian Groffen [Sat, 5 Sep 2009 10:55:47 +0000 (10:55 -0000)]
Merged from trunk -r14182:14186
| 14184 | Fix documentation of some QA_* variables. |
| arfrever | |
| 14185 | Bug #282808 - Handle a potential KeyError inside |
| zmedico | PollScheduler._poll_loop() when _poll_event_queue contains |
| | an event for a file descriptor that has already been |
| | unregistered. |
| 14186 | Remove unnecessary redundant dict lookup at the beginning |
| zmedico | of catpkgsplit(). Thanks to Marat Radchenko |
| | <slonopotamusorama@gmail.com> for this patch. |
svn path=/main/branches/prefix/; revision=14194
Fabian Groffen [Sat, 5 Sep 2009 10:54:56 +0000 (10:54 -0000)]
(reproduced commit r14192 from trunk)
reorganise const.py to have logical grouping based on usage
grouped into use with config_root, target_root or nothing, made all
variables that are used with config_root or target_root not start with a
leading slash, such that they can be directly used with os.path.join
(which they should because of xxxx_root).
svn path=/main/branches/prefix/; revision=14193
Fabian Groffen [Fri, 4 Sep 2009 19:20:24 +0000 (19:20 -0000)]
Merged from trunk -r14176:14182
| 14180 | Use _unicode_decode() on the string retunred from |
| zmedico | time.strftime(), in order to avoid a potential |
| | UnicodeDecodeError later. Thanks to Markus Duft |
| | <mduft@gentoo.org> for reporting. |
| 14181 | Bug #283513 - Do not allow --noreplace together with |
| zmedico | --emptytree since it results in bogus masking messages. |
| 14182 | Fix typo from previous commit. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14183
Fabian Groffen [Wed, 2 Sep 2009 18:36:46 +0000 (18:36 -0000)]
dispatch-conf.conf isn't really parsed by bash, but by python code, which doesn't get only sub-parts being quoted, so to fix bug #283541, quote the entire string
svn path=/main/branches/prefix/; revision=14179
Fabian Groffen [Tue, 1 Sep 2009 17:23:10 +0000 (17:23 -0000)]
Merged from trunk -r14170:14176
| 14171 | Bug #283223 - Don't call str() inside _db_escape_string(), |
| zmedico | since it's redundant and it can trigger a |
| | UnicodeEncodeError in python-2.x. |
| 14172 | Bug #283223 - Don't call str() on unicode strings inside |
| zmedico | _db_escape_string(), since it can trigger a |
| | UnicodeEncodeError in python-2.x. |
| 14173 | Fix broken indentation from previous commits. |
| zmedico | |
| 14174 | Bug #283292 - Fix FindPortdir() to prevent OSError: [Errno |
| zmedico | 2] from stat when $PWD is unset. Thanks to Jonathan Callen |
| | <en.ABCD@gmail.com> for this patch. |
| 14175 | Add dev-util/gperf to list of suspected run-time |
| arfrever | dependencies (bug #283357). |
| 14176 | Remove reference to GRP_STAGE23_USE (bug #283358). |
| arfrever | |
svn path=/main/branches/prefix/; revision=14178
Fabian Groffen [Tue, 1 Sep 2009 17:20:21 +0000 (17:20 -0000)]
Merged from trunk -r14160:14170
| 14161 | Fix mkdir() to call the local setfscreate() with strict |
| zmedico | returncode checking. Thanks to Chris PeBenito |
| | <pebenito@gentoo.org> for this patch. |
| 14162 | Use plain ascii encoding for this file, in order to avoid |
| zmedico | error messages like this which building stages (happens |
| | when python is built with USE=build): * Byte compiling |
| | python modules for python-2.6 .. ... Compiling |
| | //usr/lib64/portage/pym/portage/cache/ebuild_xattr.py ... |
| | SyntaxError: ('unknown encoding: UTF8', |
| | ('//usr/lib64/portage/pym/portage/cache/ ebuild_xattr.py', |
| | 0, 0, None)) |
| 14163 | Fix tar_contents() to handle UnicodeEncodeError by falling |
| zmedico | back to utf_8 if appropriate. |
| 14164 | Fix the code from bug #275796 to ensure that choices always |
| zmedico | go into the preferred_in_graph slot when appropriate. |
| 14165 | Bug #278729 - Inside dep_zapdeps(), account for USE |
| zmedico | dependencies in some cases where USE settings can adversely |
| | affect || preference evaluation. This requires invalid |
| | atoms to be dropped inside _expand_new_virtuals() since we |
| | only want real Atom instances inside dep_zapdeps(). Unlike |
| | previous attempts to solve this bug, cases such as || ( |
| | foo[a] foo[b] ) should now be correctly handled. |
| 14166 | Improve logic for bug #278729. |
| zmedico | |
| 14167 | Bug #281834 - In getconfig(), do not allow definition of |
| zmedico | variables that have invalid names according to shell |
| | standards (such as names containing hyphens). |
| 14168 | Use KeyValuePairFileLoader instead of getconfig() for |
| zmedico | /etc/portage/modules, since getconfig() is too strict about |
| | variable names now. Thanks to Arfrever for reporting. |
| 14169 | Use KeyValuePairFileLoader intead on getconfig(), since |
| zmedico | getconfig() is too strict about variable names now. |
| 14170 | Many packages use setuptools at run-time, so remove it from |
| arfrever | list of suspected run-time dependencies. |
svn path=/main/branches/prefix/; revision=14177
Fabian Groffen [Wed, 26 Aug 2009 10:10:57 +0000 (10:10 -0000)]
import portage, like trunk does
svn path=/main/branches/prefix/; revision=14160
Fabian Groffen [Wed, 26 Aug 2009 09:56:14 +0000 (09:56 -0000)]
bump python requirement to 2.5, patch by Jeremy Olexa, bug #282618
svn path=/main/branches/prefix/; revision=14159
Fabian Groffen [Wed, 26 Aug 2009 09:52:04 +0000 (09:52 -0000)]
Merged from trunk -r14151:14155
| 14154 | Show log paths when displaying the list of failed packages |
| zmedico | for --keep-going. |
| 14155 | Inside depgraph._show_unsatisfied_dep(), show reasons for |
| zmedico | packages masked due to backtracking. |
svn path=/main/branches/prefix/; revision=14158
Fabian Groffen [Wed, 26 Aug 2009 09:50:07 +0000 (09:50 -0000)]
import EPREFIX from portage.const, bug #282581
svn path=/main/branches/prefix/; revision=14157
Fabian Groffen [Wed, 26 Aug 2009 09:46:57 +0000 (09:46 -0000)]
fix quickpkg now os is no longer imported
svn path=/main/branches/prefix/; revision=14156
Fabian Groffen [Mon, 24 Aug 2009 10:18:57 +0000 (10:18 -0000)]
EROOT is readonly, so cannot unset it
svn path=/main/branches/prefix/; revision=14153
Fabian Groffen [Mon, 24 Aug 2009 10:16:48 +0000 (10:16 -0000)]
Merged from trunk -r14140:14151
| 14151 | make sure we can deal with arches like x86-fbsd, like is |
| grobian | done in bin/ebuild-helpers/prepstrip |
svn path=/main/branches/prefix/; revision=14152
Fabian Groffen [Mon, 24 Aug 2009 10:12:18 +0000 (10:12 -0000)]
fix portage meltdown due to wrong order of imports
svn path=/main/branches/prefix/; revision=14150
Fabian Groffen [Mon, 24 Aug 2009 10:05:03 +0000 (10:05 -0000)]
conflicts are bad, and not valid python syntax
svn path=/main/branches/prefix/; revision=14149
Fabian Groffen [Mon, 24 Aug 2009 09:50:34 +0000 (09:50 -0000)]
Merged from trunk -r14131:14140
| 14132 | Add a LIVEVCS.unmasked category for ebuilds that have |
| zmedico | non-empty KEYWORDS and are not masked in the global |
| | package.mask. Thanks to Diego E. Pettenò for the |
| | suggestion. |
| 14133 | Bug #282306 - Inside dblink._match_contents(), fall back to |
| zmedico | utf_8 encoding if a path cannot be encoded under the user's |
| | chosen encoding. This should fix the traceback shown in bug |
| | #281199, comment #26. |
| 14134 | Bug #282505 - Fix unicode handling for package moves in |
| zmedico | binary packages. |
| 14140 | remove FIXME, since zmedico fixed it |
| grobian | |
svn path=/main/branches/prefix/; revision=14148
Fabian Groffen [Mon, 24 Aug 2009 09:49:02 +0000 (09:49 -0000)]
port LinkageMap encoding fix to LinkageMapMachO
svn path=/main/branches/prefix/; revision=14147
Fabian Groffen [Mon, 24 Aug 2009 09:44:30 +0000 (09:44 -0000)]
Merged from trunk -r14130:14131
| 14131 | Bug #282306 - Inside |
| zmedico | LinkageMap._ObjectKey._generate_object_key(), fall back to |
| | utf_8 encoding if a path cannot be encoded under the user's |
| | chosen encoding. This should complete the fix for the |
| | traceback shown in bug #282115, comment #6. |
svn path=/main/branches/prefix/; revision=14146
Fabian Groffen [Mon, 24 Aug 2009 09:42:25 +0000 (09:42 -0000)]
Merged from trunk -r14127:14130
| 14128 | Make Scheduler._choose_pkg() prefer uninstall operations |
| zmedico | when available. |
| 14129 | In Scheduler._schedule_tasks_imp(), add uninstall operations |
| zmedico | to the front of the merge queue. |
| 14130 | Bug #282306 - Inside dblink._find_libs_to_preserve(), fall |
| zmedico | back to utf_8 encoding if a path cannot be encoded under the |
| | user's chosen encoding. This fixes the traceback shown in |
| | bug 282115, comment #6. |
svn path=/main/branches/prefix/; revision=14145
Fabian Groffen [Mon, 24 Aug 2009 09:40:49 +0000 (09:40 -0000)]
Merged from trunk -r14117:14127
| 14118 | Note that package.* and use.* as directories is only |
| zmedico | supported since portage-2.1.6.7, and it is not included in |
| | PMS at this time. |
| 14119 | Avoid potential empty lines in warnings about missing |
| arfrever | SONAMEs or NEEDED entries. Found by Zac Medico. |
| 14120 | Add support for --selective=n, so it can be used to remove |
| zmedico | selective behavior that may have been implied by some other |
| | option like --update. |
| 14121 | Add support for --keep-going=n so that it can be disabled |
| zmedico | on the command line after it's been enabled in |
| | EMERGE_DEFAULT_OPTS. |
| 14122 | Add some --debug output for backtracking. Also, remove |
| zmedico | unused imports. |
| 14124 | Bug #282269 - Avoid str() calls with overlay paths, which |
| zmedico | can trigger UnicodeEncodeError in python-2.x. |
| 14125 | Bug #282306 - Inside dblink._security_check(), fall back to |
| zmedico | utf_8 encoding it a path cannot be encoded under the user's |
| | chosen encoding. |
| 14126 | Bug #282269, comment #2 - Avoid potential |
| zmedico | UnicodeEncodeError when writing to sys.stderr inside |
| | xtermTitle(). |
| 14127 | Support package.provided directory. |
| arfrever | |
svn path=/main/branches/prefix/; revision=14144
Fabian Groffen [Mon, 24 Aug 2009 09:38:13 +0000 (09:38 -0000)]
Merged from trunk -r14107:14117
| 14108 | Use _encodings where appropriate. |
| zmedico | |
| 14109 | Use _encodings where appropriate. |
| zmedico | |
| 14110 | Use _encodings where appropriate. |
| zmedico | |
| 14111 | Use _encodings where appropriate and add |
| zmedico | _encodings['stdio'] for stdout encoding. |
| 14112 | Fix typo. |
| zmedico | |
| 14113 | Replace _content_encoding, _fs_encoding, and |
| zmedico | _merge_encoding with direct usage of _encodings. |
| 14114 | Support QA_DT_HASH_${ARCH} and QA_PRESTRIPPED_${ARCH} (bug |
| arfrever | #271416). |
| 14115 | Add support for QA_SONAME variable (bug #281964). Add |
| arfrever | support for QA_NEEDED variable. |
| 14116 | Improve an example. Patch by Jeremy Olexa. |
| arfrever | |
| 14117 | Rename QA_NEEDED to QA_DT_NEEDED. |
| arfrever | |
svn path=/main/branches/prefix/; revision=14143
Fabian Groffen [Mon, 24 Aug 2009 09:36:42 +0000 (09:36 -0000)]
Merged from trunk -r14097:14107
| 14098 | Use _encodings['repo.content'] for decoding profiles.desc, |
| zmedico | ChangeLog, metadata.xml, and ebuilds. |
| 14099 | Use _encodings where appropriate. |
| zmedico | |
| 14100 | Use _encodings where appropriate. |
| zmedico | |
| 14101 | Use _encodings where appropriate. |
| zmedico | |
| 14102 | If sys.getdefaultencoding() returns None (this can happen |
| zmedico | if python is built with USE=build, in stage 1), fall back |
| | to _encodings['merge'] = 'ascii'. |
| 14103 | Fix typo from previous commit. |
| zmedico | |
| 14104 | Fix portage.5 man page to document the fact that some files |
| arfrever | in profiles directory can be directories. |
| 14105 | Use _encodings where appropriate. |
| zmedico | |
| 14106 | Use _encodings where appropriate. |
| zmedico | |
| 14107 | Use _encodings where appropriate. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14142
Fabian Groffen [Mon, 24 Aug 2009 09:34:26 +0000 (09:34 -0000)]
Merged from trunk -r14087:14097
| 14088 | Use _content_encoding where appropriate. |
| zmedico | |
| 14089 | Use the new portage.output._init(config_root) function. |
| zmedico | |
| 14090 | Use _content_encoding and _fs_encoding, and use strict |
| zmedico | unicode exceptions where appropriate. |
| 14091 | Replace the _{content,fs,merge}_encoding attributes with an |
| zmedico | _encodings dict. |
| 14092 | Use errors='backslashreplace' instead of 'replace' for the |
| zmedico | default _unicode_encode() argument ('replace' substitutes |
| | '?', which is not as useful). |
| 14093 | Use portage.os and _encodings['fs'] where appropriate. |
| zmedico | |
| 14094 | Use portage.os and _encodings where appropriate. |
| zmedico | |
| 14095 | Use portage.os and _encodings where appropriate. |
| zmedico | |
| 14096 | Remove unused os import. |
| zmedico | |
| 14097 | Use portage.os and _encodings where appropriate. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14141
Fabian Groffen [Mon, 24 Aug 2009 09:31:55 +0000 (09:31 -0000)]
Merged from trunk -r14077:14087
| 14078 | Use portage.os, _content_encoding, and _fs_encoding where |
| zmedico | appropriate. |
| 14079 | Enable error='strict' when encoding arguments inside |
| zmedico | _unicode_func_wrapper(), and document behavior. |
| 14080 | Use portage.os, _content_encoding, and _fs_encoding where |
| zmedico | appropriate. |
| 14081 | Bug #277619 - Fix news item relevance logic. Thanks to Alec |
| zmedico | Warner <antarus@gentoo.org> for this patch. |
| 14082 | Use st_* attributes instead of the stat module. |
| zmedico | |
| 14083 | Implement lazy loading of color.map when either the codes or |
| zmedico | _styles attribute is accessed. This provides and |
| | _init(config_root='/') function that the prefix branch can |
| | use to substitute an appropriate config_root value at |
| | runtime. |
| 14084 | Use _content_encoding and _fs_encoding where appropriate. |
| zmedico | |
| 14085 | Use _content_encoding and _fs_encoding where appropriate. |
| zmedico | Also, enable strict exceptions for unicode encoding |
| | failures. |
| 14086 | Bug #270866 - Validate News-Item-Format headers. |
| zmedico | |
| 14087 | Don't wrap os.popen(). |
| zmedico | |
svn path=/main/branches/prefix/; revision=14139
Fabian Groffen [Mon, 24 Aug 2009 09:28:51 +0000 (09:28 -0000)]
Merged from trunk -r14067:14077
| 14068 | Use elog in _eapi0_pkg_nofetch(). |
| zmedico | |
| 14069 | sets/files.py cleanPackages function stop calling lock and |
| volkmar | load and requires the caller to do that changing unmerge to |
| | reflect this change |
| 14070 | Scheduler is now able to clean world set when removing a |
| volkmar | package. world_atom function has been updated and |
| | PackageUninstall is calling it after unmerge. |
| 14071 | Use a clean listener system for portage.elog instead of |
| volkmar | _emerge_elog_listener |
| 14072 | Use _content_encoding and _fs_encoding for unicode |
| zmedico | encoding/decoding. |
| 14073 | When _unicode_func_wrapper() decodes a string in a returned |
| zmedico | list (typically from os.listdir), discard values with |
| | invalid encoding. This insures that all names returned from |
| | all os.listdir() calls are valid. |
| 14074 | Use portage.os and _fs_encoding where appropriate, and fix |
| zmedico | binary string handling for py3k compat. |
| 14075 | Print a warning when nonexistent files have been passed to |
| arfrever | dohtml. |
| 14076 | Add 'return False' which was missing from the previous |
| arfrever | commit. |
| 14077 | Test the edge case. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14138