Fabian Groffen [Thu, 5 Mar 2009 18:32:23 +0000 (18:32 -0000)]
Merged from trunk -r12699:12704
| 12700 | In LazyItemsDict, avoid storing empty lists and dicts when |
| zmedico | no positional or keyword arguments are given. |
| 12701 | Fix headers that contain $Header instead of $Id. |
| zmedico | |
| 12702 | Fix breakage in USE_EXPAND wildcard handling, from r12697. |
| zmedico | |
| 12703 | Make USE_EXPAND wildcard expansion more efficient, and |
| zmedico | prevent possible duplicates. |
| 12704 | If deepcopy() raises a TypeError for a lazy item that has |
| zmedico | been added via a call to LazyItemsDict.addLazySingleton(), |
| | automatically evaluate the the singleton and instead call |
| | deepcopy() on the result. |
svn path=/main/branches/prefix/; revision=12761
Fabian Groffen [Mon, 23 Feb 2009 19:34:06 +0000 (19:34 -0000)]
Merged from trunk -r12686:12697
| 12687 | When decoding term codes inside the JobStatusDisplay |
| zmedico | constructor, use the 'replace' error handling scheme in |
| | order to avoid triggering a potential UnicodeError. |
| 12688 | Add support in _ensure_default_encoding(), add support for |
| zmedico | utf_8 and fall back to utf_8 if the encoding returned by |
| | sys.getdefaultencoding() is unavailable. |
| 12689 | When encoding strings inside vardbapi._counter_hash() and |
| zmedico | vardbapi._owners_cache._hash_str(), use 'backslashreplace' |
| | in order to avoid potential UnicodeError exceptions. Use |
| | constant ascii and utf_8 codecs, respectively, since these |
| | codecs are guaranteed to be available by |
| | _ensure_default_encoding(). |
| 12690 | Bump vardbapi._owners_cache_version from 1 to 2 since hash |
| zmedico | value encoding is now hardcoded as utf_8. |
| 12691 | When displaying reverse dependencies in verbose |
| zmedico | --depclean/--prune output, sort the parent packages by cpv. |
| 12692 | Don't try to call setdefaultencoding() since it's not |
| zmedico | intended to be called. |
| 12693 | Revert vardbapi._owners_cache_version and unicode handling |
| zmedico | since it needs some more work. |
| 12694 | Reorganize _ensure_default_encoding(). |
| zmedico | |
| 12695 | Fix default_encoding logic in _ensure_default_encoding(). |
| zmedico | |
| 12696 | Fix getmaskingstatus() so that it doesn't inappropriately |
| zmedico | return a 'missing keyword' mask is some cases when the user |
| | has ** in package.keywords. Thanks to Raúl Porcel |
| | <armin76@g.o> for reporting. |
| 12697 | In config.setcpv(), increase efficiency by filtering USE |
| zmedico | with IUSE before calculating USE_EXPAND variables. Also use |
| | a generator expression instead of a list comprehension in |
| | the USE_EXPAND generation code. |
svn path=/main/branches/prefix/; revision=12699
Fabian Groffen [Mon, 23 Feb 2009 19:29:16 +0000 (19:29 -0000)]
Merged from trunk -r12671:12686
| 12672 | In LazyItemsDict, when a singleton is instantiated, replace |
| zmedico | the wrapper with the singleton since the wrapper is no |
| | longer needed at this point. |
| 12673 | In config.setcpv(), use LazyItemsDict to implement lazy |
| zmedico | evaluation of PORTAGE_IUSE. The PORTAGE_IUSE value is lazily |
| | evaluated since re.escape() is slow and the value is only |
| | used when an ebuild phase needs to be executed (it's used |
| | only to generate QA notices). Thanks to Marat Radchenko |
| | <slonopotamusorama@gmail.com> for identifying this |
| | performance issue and submitting the initial patch which |
| | used a memoization approach instead of lazy evaluation. |
| 12674 | Make the UserDict and LazyItemsDict constructors use an |
| zmedico | optional positional argument instead of a keyword argument. |
| 12675 | Make lazy_import() skip proxy creation for modules that |
| zmedico | already exist in sys.modules. |
| 12676 | Reduce bloat in portage.util by splitting ObjectProxy and |
| zmedico | lazyimport into a new portage.proxy package. |
| 12677 | Fix typo in __all__. |
| zmedico | |
| 12678 | Make lazyimport proxies trigger automatic destruction of |
| zmedico | other proxies for modules that have been imported. This way, |
| | destruction of a single proxy can trigger destruction of all |
| | the rest. |
| 12679 | Fix _LazyImportFrom to use the correct module name when |
| zmedico | registering and unregistering. |
| 12680 | Use lazyimport to avoid importing the checksum, locks, and |
| zmedico | util modules when portage is initially imported. |
| 12681 | Use lazyimport to avoid importing the dep, output, update, |
| zmedico | and versions modules when portage is initially imported. |
| 12682 | Use lazyimport to avoid importing the portage.elog module |
| zmedico | when portage is initially imported. |
| 12683 | Use a lock to ensure that threaded code doesn't cause |
| zmedico | problems with proxy registration and unregistration. |
| 12684 | The python that's inside stage 1 or 2 is built with a |
| zmedico | minimal configuration which does not include the |
| | /usr/lib/pythonX.Y/encodings directory. This results in |
| | error like the following: LookupError: no codec search |
| | functions registered: can't find encoding In order to solve |
| | this problem, detect it early and manually register a search |
| | function for the ascii codec. Starting with python-3.0 this |
| | problem is more noticeable because of stricter handling of |
| | encoding and decoding between strings of characters and |
| | bytes. |
| 12685 | Avoid spurious CCACHE_DIR permissions adjustments when |
| zmedico | fetching with a temporary PORTAGE_TMPDIR setting (for |
| | fetchonly). Thanks to Marat Radchenko |
| | <slonopotamusorama@gmail.com> for reporting. |
| 12686 | In EbuildFetchonly.execute(), skip builddir creation when |
| zmedico | the ebuild does not set RESTRICT=fetch (since it's not |
| | possible for pkg_nofetch to be executed in this case). |
svn path=/main/branches/prefix/; revision=12698
Fabian Groffen [Sat, 21 Feb 2009 11:08:01 +0000 (11:08 -0000)]
Merged from trunk -r12664:12669
| 12665 | When loading vdb_metadata.pickle inside |
| zmedico | vardbapi._aux_cache_init(), in order to avoid an extreme |
| | performance issue, disable buffering when opening the file |
| | under python-3.0. Unfortunately, performance is still poor |
| | relative to python-2.x, but buffering makes it much worse. |
| 12666 | For python-3.0 compatibility, open files in binary mode |
| zmedico | inside SpawnProcess._start(). |
| 12667 | Inside summarylist(), it's possible for |
| zmedico | myglsa.packages.keys() to contain unicode objects, which |
| | trigger and exception like this: File |
| | "//usr/lib64/portage/pym/portage/dep.py", line 535, in |
| | __init__ obj_setattr(self, x, getattr(s, x)) AttributeError: |
| | 'unicode' object has no attribute '__eq__' To solve this |
| | problem, convert unicode objects to plain str before passing |
| | them to the portage api. |
| 12668 | Inside portage.spawn(), open files for logfile handling in |
| zmedico | binary mode, for compatibility with python-3.0. |
| 12669 | Revert r12639 and use string.ascii_letters for python-3.0 |
| zmedico | compatibility. |
svn path=/main/branches/prefix/; revision=12671
Fabian Groffen [Sat, 21 Feb 2009 11:05:26 +0000 (11:05 -0000)]
Merged from trunk -r12652:12664
| 12653 | Optimize depgraph._dep_expand() to avoid calling |
| zmedico | pordbapi.cp_all(), since it can be more efficient to call |
| | cp_list() on each category. Thanks to Marat Radchenko |
| | <slonopotamusorama@gmail.com> for the suggestion. |
| 12654 | Make isvalidatom() identify empty slot as invalid (missing |
| zmedico | slot is valid) and add a corresponding test case. |
| 12655 | When displaying the list of failed packages, tell the number |
| zmedico | that failed. Thanks to Jeremy Olexa <darkside@g.o> for the |
| | suggestion. |
| 12656 | Add back Rev to svn:keywords (accidentally removed when |
| zmedico | setting Id). Thanks to ABCD for reporting. |
| 12658 | Try to fix svn:keywords again. |
| zmedico | |
| 12659 | Try to fix svn:keywords again. |
| zmedico | |
| 12661 | Add a new portage.utils.lazy_import() function which behaves |
| zmedico | similar to the snakeoil.demandload.demandload() function. |
| 12662 | Fix StringIO imports so that 2to3 can handle them. Also, |
| zmedico | replace shlex + StringIO usage with shlex.split() where |
| | appropriate. |
| 12663 | In python-3.0, integer division results in a float, so |
| zmedico | convert back to int. |
| 12664 | Add a cross reference from FEATURES=lmirror docs to the |
| zmedico | "local" mirror docs in portage(5). |
svn path=/main/branches/prefix/; revision=12670
Fabian Groffen [Thu, 19 Feb 2009 17:58:41 +0000 (17:58 -0000)]
Merged from trunk -r12633:12649
| 12634 | Bug #230483 - Convert glsa-check option parsing to use the |
| zmedico | optparse module. This replaces some code which triggers a |
| | traceback from 2to3. Thanks to Ali Polatel <hawking@g.o> for |
| | this patch. |
| 12635 | For python-3.0 compatibility, raise a real exception instead |
| zmedico | of a string. |
| 12636 | Inside post_emerge(), skip the vardbapi counter check when |
| zmedico | in --pretend mode (significant performance improvement). |
| | Thanks to Marat Radchenko (slonopotamus) for reporting. |
| 12637 | Don't bother to calculate PORTAGE_COUNTER_HASH when in |
| zmedico | --pretend mode. |
| 12638 | Use a regular expression for the file.name check. This |
| zmedico | replaces some odd map() usage that 2to3 warns about. |
| 12639 | For python-3.0 compatibility, don't use string.letters. |
| zmedico | |
| 12640 | For compatibility with python-3.0, inherit from ObjectProxy |
| zmedico | instead of inheriting directly from file. |
| 12641 | For compatibility with python-3.0, always open streams for |
| zmedico | pickles in binary mode. |
| 12642 | For compatibility with python-3.0, open files in text mode |
| zmedico | where appropriate. |
| 12643 | Revert accidental python-3.0 syntax. |
| zmedico | |
| 12644 | Tweak code to avoid python-3.0 errors like this one: |
| zmedico | SyntaxError: can not delete variable 'e' referenced in |
| | nested scope |
| 12645 | For python-3.0 compatibility, encode strings as binary |
| zmedico | before trying to pass them to hashlib. |
| 12646 | Tweak exception handling indentation to avoid a bug in 2to3. |
| zmedico | |
| 12647 | Fix update() methods to work with python-3.0. |
| zmedico | |
| 12648 | Handle ValueError when unpickling, since this can be |
| zmedico | triggered by an unsupported pickle protocol. |
| 12649 | Decode terminal codes from binary when necessary, for |
| zmedico | python-3.0 compatibility since sys.stdout is a text stream. |
svn path=/main/branches/prefix/; revision=12652
Fabian Groffen [Thu, 19 Feb 2009 17:50:29 +0000 (17:50 -0000)]
Merged from trunk -r12619:12633
| 12620 | unify code for unpacking of tar files |
| SpankMan | |
| 12621 | Bug #259124 - Inside EbuildFetcher._start(), pass the |
| zmedico | NOCOLOR variable into the fetch environment, so that |
| | --color=n is respected. |
| 12622 | Fix grabfile_package() to preprocess atoms before passing |
| zmedico | them to isvalidatom() because isvalidatom() has gotten more |
| | strict since r12614. Thanks to ABCD for reporting. |
| 12623 | Bug #253904 - Add a lookahead mechanism inside |
| zmedico | depgraph._dep_check_composite_db._visible() which masks |
| | package choices that are likely to trigger slot conflicts. |
| | Thanks to Vlastimil Babka <caster@g.o> for the suggestion. |
| 12624 | Call depgraph._dep_check_composite_db._clear_cache() inside |
| zmedico | depgraph._add_pkg() since |
| | _dep_check_composite_db._visible() is now affected by which |
| | packages are added to the graph. |
| 12625 | Make save_ebuild_env() filter NOCOLOR, and remove related |
| zmedico | code from ebuild.sh since that variable is not loaded from |
| | $T/environment anymore. |
| 12626 | Set svn:keywords Id on all files. |
| zmedico | |
| 12628 | In python-3.0, the UserDict.DictMixin class has been |
| zmedico | replaced by Mapping and MutableMapping from the collections |
| | module, but 2to3 doesn't currently account for this change: |
| | http://bugs.python.org/issue2876 As a workaround for the |
| | above issue, implement Mapping and MutableMapping classes |
| | as substitutes for UserDict.DictMixin so that code |
| | converted via 2to3 will run. |
| 12629 | Implement a substitute for UserDict.UserDict so that code |
| zmedico | converted via 2to3 will run: |
| | http://bugs.python.org/issue2876 |
| 12630 | Implement UserDict.__contains__() and __iter__(). |
| zmedico | |
| 12631 | Remove redundant ConfigLoaderKlass.__iter__() method. |
| zmedico | |
| 12632 | Fix classes that implement __iter__() to copy it to their |
| zmedico | keys() method when running under >=python-3.0. |
| 12633 | For compatibility with python-3.0, use isinstance() instead |
| zmedico | of type(). |
svn path=/main/branches/prefix/; revision=12651
Fabian Groffen [Thu, 19 Feb 2009 17:43:48 +0000 (17:43 -0000)]
Merged from trunk -r12608:12619
| 12609 | Automatically export QA_PRESTRIPPED if it's set. Thanks to |
| zmedico | Raúl Porcel <armin76@g.o> for reporting. |
| 12610 | For the --buildpkgonly digraph.hasallzeros() check, remove |
| zmedico | "nomerge" nodes from the graph. This makes it unnecessary to |
| | tweak the dependency priority for onlydeps packages inside |
| | depgraph._add_pkg_dep(). |
| 12611 | In depgraph._serialize_tasks(), when appropriate, execute |
| zmedico | uninstall tasks sooner. This solves some cases of bug |
| | #256870 since there is a smaller window of time for some |
| | other failure to cause the uninstall to get discarded. |
| 12612 | Bug #250020 - When calculating merge order, try to ensure |
| zmedico | that packages listed in DEPEND are updated before whenever |
| | possible (even though the DEPEND may already be satisfied by |
| | an installed instance). The changes to the merge order |
| | algorithm should also account for many common cases of bug |
| | #199856, but does not necessarily solve all cases. Whenever |
| | possible, the new algorithm avoids dropping dependencies |
| | that are satisfied by installed packages. Such dependencies |
| | are only dropped in a couple of cases: * when solving |
| | circular dependencies * when promoting packages to in the |
| | merge list (either due an unsatisfied PDEPEND or a portage |
| | upgrade) |
| 12613 | Fix merge order calculation so that the circular runtime |
| zmedico | path isn't entered when it's possible to select a node that |
| | only has unsatisfied PDEPEND. This reverts an unintended |
| | change from the patch for bug #250020, and solves a problem |
| | with libperl being merged after perl when building stage 1. |
| 12614 | Fix isvalidatom to properly identify an invalid atom such as |
| zmedico | 'dev-java/nanoxml*'. Thanks to Vlastimil Babka <caster@g.o> |
| | for reporting. |
| 12615 | Fix isvalidatom() logic from previous commit to avoid false |
| zmedico | positives. |
| 12616 | Fix more false positives in isvalidatom() from previous |
| zmedico | commits. |
| 12617 | Add a test case for the new case which is detected by |
| zmedico | isvalidatom(). |
| 12618 | In dyn_package(), show a more informative die message if an |
| zmedico | error occurs when creating the tarball. |
| 12619 | Fix broken references to DepPriority attributes. |
| zmedico | |
svn path=/main/branches/prefix/; revision=12650
Fabian Groffen [Sat, 14 Feb 2009 11:07:30 +0000 (11:07 -0000)]
Merged from trunk -r12593:12605
|12594 |Remove support for deprecated 2_pre* EAPI values. |
|zmedico| |
|12595 |Keep 2_pre* EAPI values in the deprecated list so that uninstalls still work |
|zmedico|normally. |
|12596 |Add new EAPI 3_pre1 value, and disable unpack() support for *.xz for earlier EAPI |
|zmedico|values. |
|12597 |Document EAPI 3_pre1. |
|zmedico| |
|12598 |Bug #258433 - Note FETCHCOMMAND and RESUMECOMMAND requirements wrt ${FILE} for |
|zmedico|compatibility with EAPI 2. |
|12599 |Inside depgraph._select_atoms(), only trigger the circular dependency avoidance |
|zmedico|code for buildtime dependencies. This solves a problem with virtual/mysql |
| |inappropriately pulling in mysql-community from PDEPEND when satisfying deps of |
| |plain mysql. Thanks to Krzysiek Pawlik <nelchael@g.o> for reporting this issue: |
| |http://archives.gentoo.org/gentoo-dev/msg_efce154d642fe6ede38d084a33c7f949.xml |
|12600 |Bug #258433 - In portage.fetch(), check for missing ${FILE} parameter in |
|zmedico|FETCHCOMMAND or RESUMECOMMAND and bail out early if necessary. |
|12601 |Inside portage.fetch(), check for the case where FETCOMMAND creates a directory |
|zmedico|where a file is expected. This can happen if FETCHCOMMAND erroneously contains |
| |wget's -P option where it should instead have -O, as reported in bug #258433, |
| |comment #16. |
|12602 |* Remove outdated comment about qa_source() return value (with typo). * Update |
|zmedico|copyright header. Thanks to Jeremy Olexa <darkside@g.o> for reporting. |
|12603 |Add a new "portage.internal" warning for prepalldocs usage since the council ruled|
|zmedico|that it shouldn't be used in ebuilds. Thanks to Petteri Räty <betelgeuse@g.o> for|
| |the initial patch. |
|12604 |Fix Scheduler._prevent_builddir_collisions() to skip non-Package instances when |
|zmedico|necessary. |
|12605 |In depgraph._serialize_tasks(), verify that an uninstall task has at least one |
|zmedico|theoretically mergeable parent before choosing to reverse it's edges. |
svn path=/main/branches/prefix/; revision=12608
Fabian Groffen [Sat, 14 Feb 2009 10:57:35 +0000 (10:57 -0000)]
Merged from trunk -r12583:12593
| 12584 | For python-3.0 compatibility, make dict-like classes modify |
| zmedico | their keys(), items(), and values() methods appropriatly |
| | for the current python version. |
| 12585 | Inside depgraph._serialize_tasks(), simplify the logic |
| zmedico | which delays selection of root nodes. |
| 12586 | Make DepPriority.__str__() indicate optional deps. |
| zmedico | |
| 12587 | Fix digraph.clone() to properly clone priority lists. |
| zmedico | |
| 12588 | fix --libdir detection when econf is passed |
| SpankMan | whitespace/empty arguments ... those break the plain string |
| | expansion comparison |
| 12589 | fix previous commit -- hasq isnt as cool as i thought and |
| SpankMan | doesnt accept globs, so define a new hasg() func that does |
| | and use that |
| 12590 | cleanup econf() code -- use hasg* funcs in multilib code to |
| SpankMan | avoid wrong/duplicate parsing methods, move all handling to |
| | "$@" to avoid duplication, and make sure we prepend |
| | arguments coming from the ebuild rather than append -- only |
| | EXTRA_ECONF from user should override things |
| 12591 | Escape globs in hasgq arguments in order to prevent bash |
| zmedico | from trying to perform filename expansion. |
| 12592 | Filter the new hasg and hasgq functions inside |
| zmedico | save_ebuild_env(). |
| 12593 | add support for .xz compressed files like .lzma |
| SpankMan | |
svn path=/main/branches/prefix/; revision=12607
Fabian Groffen [Sat, 14 Feb 2009 10:46:01 +0000 (10:46 -0000)]
Merged from trunk -r12565:12583
| 12566 | Always ignore hidden files when generating Manifests. Thanks |
| zmedico | to Christian Ruppert for reporting. |
| 12567 | Implement Manifest2Entry.__ne__() so that comparisons inside |
| zmedico | Manifest.write() work properly (to avoid rewriting an |
| | identical manifest when possible). |
| 12568 | Fix logic inside depgraph._serialize_tasks() to avoid the |
| zmedico | circular runtime deps path in some cases when it's not |
| | appropriate. This solves a case that was reported, in which |
| | the perl was merged before libperl due do perl and lots of |
| | it's deps being selected all at once. In this case, so many |
| | packages were selected at once that the cmp_circular_bias() |
| | sort did not order them very well (though it normally works |
| | fine with a smaller number of packages). Thanks to Daniel |
| | Robbins for reporting this issue and helping me reproduce |
| | it. |
| 12569 | Bug #256616 - Since dependencies on system packages are |
| zmedico | frequently unspecified, merge them only when no builds are |
| | executing. When a system package finishes building, it's |
| | added to a wait queue that is only processed when the number |
| | of running builds drops to zero. All pending merges are then |
| | processed before any new builds are allowed to start. |
| 12570 | In depgraph._serialize_tasks(), when separating uninstall |
| zmedico | nodes from leaf nodes, do it earlier so that it covers more |
| | code paths. |
| 12571 | Add a cmp_sort_key class which makes it easier to port code |
| zmedico | for python-3.0 compatibility. It works by generating key |
| | objects which use the given cmp function to implement their |
| | __lt__ method. |
| 12572 | Use portage.util.cmp_sort_key for python-3.0 compatibility. |
| zmedico | |
| 12573 | Use portage.util.cmp_sort_key for python-3.0 compatibility. |
| zmedico | |
| 12574 | Use portage.util.cmp_sort_key for python-3.0 compatibility. |
| zmedico | |
| 12575 | Make emerge --regen return non-zero if that are any |
| zmedico | failures. Thanks to Daniel Robbins for reporting. |
| 12576 | Add a DepPriority.optional attribute for optional build time |
| zmedico | deps that are pulled in by --with-bdeps=y. |
| 12577 | For optional deps pulled in by --with-bdeps=y, set |
| zmedico | DepPriority.buildtime to False. |
| 12578 | Bug #256616 - Also consider deep runtime dependencies of |
| zmedico | system packages when adding packages to merge_wait_queue. |
| 12579 | Add UnmergeDepPriority.optional attribute, to avoid |
| zmedico | traceback. |
| 12580 | Add support in digraph for multiple priorities per edge and |
| zmedico | support for callable ignore_priority arguments that can be |
| | used for finer grained filtering. |
| 12581 | Fix Scheduler._find_system_deps() so that it only traverses |
| zmedico | runtime deps. |
| 12582 | Fix the priorities display in digraph.debug_print() so it |
| zmedico | shows the highest priority (since multiple priorities are |
| | now supported). |
| 12583 | Warn about WANT_AUTO(CONF|MAKE)=latest settings since they |
| zmedico | are redundant. Thanks to Petteri Räty <betelgeuse@g.o> for |
| | the initial patch. |
svn path=/main/branches/prefix/; revision=12606
Fabian Groffen [Fri, 30 Jan 2009 21:33:30 +0000 (21:33 -0000)]
For Interix where /bin/sh is totally broken on Vista, we need make to use bash from our prefix, which is not broken. I don't think this should hurt anyone, so we just use prefix bash for everyone now with emake.
svn path=/main/branches/prefix/; revision=12565
Fabian Groffen [Fri, 30 Jan 2009 21:29:57 +0000 (21:29 -0000)]
Merged from trunk -r12556:12560
| 12557 | When scheduling builds in parallel for --jobs, avoid |
| zmedico | potential build dir collisions in cases when the same exact |
| | cpv needs to be merged to multiple $ROOTs (like when |
| | building stages). Thanks for Daniel Robbins for reporting |
| | this issue and troubleshooting it. |
| 12558 | In EbuildFetcher._start(), don't touch the build dir when in |
| zmedico | prefetch mode. In this case, logging goes to |
| | emerge-fetch.log and the builddir should not be touched |
| | since otherwise it could interfere with another instance of |
| | the same cpv concurrently being built for a different $ROOT |
| | (currently, builds only cooperate with prefetchers that are |
| | spawned for the same $ROOT). Thanks to Daniel Robbins for |
| | reporting this issue. |
| 12559 | - hardened gets way to many misfiled bugs related to |
| solar | qa-execstack. Make it clear that bugs go to the maintainers |
| | of the pkg and not hardened for fun and profit |
| 12560 | Fix color in merge list [ebuild ] display, so it's the same |
| zmedico | regardless of $ROOT. |
svn path=/main/branches/prefix/; revision=12564
Fabian Groffen [Fri, 30 Jan 2009 21:26:11 +0000 (21:26 -0000)]
Merged from trunk -r12552:12556
| 12553 | Inside fetch(), only mention /var/log/emerge-fetch.log in |
| zmedico | locking messages when called by emerge. |
| 12554 | Remove the emerge-fetch.log lock message code from fetch() |
| zmedico | since this is handled by the EbuildBuild class when it |
| | synchronizes with the prefetcher. |
| 12555 | Add messages before and after the src_prepare phase. Thanks |
| zmedico | to Arfrever for this patch. |
| 12556 | Fix die() usage in ebuild phase examples. Thanks to Jeremy |
| zmedico | Olexa <darkside@g.o> for this patch. |
svn path=/main/branches/prefix/; revision=12563
Fabian Groffen [Fri, 30 Jan 2009 21:23:15 +0000 (21:23 -0000)]
Merged from trunk -r12543:12552
| 12544 | Fix interaction between ignorelist and ignorecvs parameters |
| zmedico | inside cacheddir(). Thanks to Christian Ruppert for |
| | reporting. |
| 12545 | Make listdir(ignorecvs=True) ignore .git directories. Thanks |
| zmedico | to Christian Ruppert for the suggestion. |
| 12546 | Make depgraph._add_dep() ignore fewer dependencies when not |
| zmedico | in --deep mode, by making it so that it will always account |
| | for dependencies on packages that are already installed. |
| 12547 | Inside depgraph.loadResumeCommand(), when appropriate, |
| zmedico | complete the graph before analyzing any unsatisfied deps |
| | that may exist. |
| 12548 | Inside depgraph.loadResumeCommand(), always enable deep |
| zmedico | traversal of dependencies. This is necessary for correct |
| | --keep-going or --resume operation in case a package from a |
| | group of circularly dependent packages fails. |
| 12549 | Inside depgraph._add_dep(), drop unnecessary build-time deps |
| zmedico | if there is no package available to satisfy it. |
| 12550 | Fix typo in previous commit. |
| zmedico | |
| 12551 | Add an ignore_priority parameter to digraph.parent_nodes(). |
| zmedico | |
| 12552 | Inside depgraph._dep_expand(), filter use dbapi.cp_list() to |
| zmedico | filter out any results from dbapi.cp_all() that happen to |
| | not contain any ebuilds. Thanks to Jeremy Olexa |
| | <darkside@g.o> for reporting. |
svn path=/main/branches/prefix/; revision=12562
Fabian Groffen [Fri, 30 Jan 2009 21:20:54 +0000 (21:20 -0000)]
Merged from trunk -r12528:12543
| 12529 | Bug #255358 - Add new RDEPEND.implicit warning to detect the |
| zmedico | caes where DEPEND is set and RDEPEND is unset in the ebuild, |
| | since this triggers implicit RDEPEND=$DEPEND assignment. |
| 12540 | When in --keep-going mode, don't suppress the list of failed |
| zmedico | packages display at the end when there is only one failure, |
| | since the failure may have occurred much earlier and the |
| | related output may not be visible any longer. |
| 12541 | Inside depgraph.loadResumeCommand(), ignore unsatisified |
| zmedico | dependencies that are pulled in by installed packages. This |
| | is needed in order to avoid having --keep-going bail out |
| | needlessly when one of a group of circularly dependent |
| | packages fails to install after one or more of the group |
| | have already been installed. TODO: Add sanity checks to make |
| | sure that it's really safe to ignore all the deps that can |
| | be ignored by this code. |
| 12542 | In depgraph.loadResumeCommand(), account for unsatisfied |
| zmedico | dependencies of installed packages if they are in the |
| | subgraph of dependencies of a package which is scheduled to |
| | be installed. |
| 12543 | Bug #199408 - Always enable the skip_masked and |
| zmedico | skip_unsatisfied for the resume_depgraph() function. This |
| | will cause emerge --resume to automatically drop masked |
| | packages (without the need to specify --skipfirst). |
svn path=/main/branches/prefix/; revision=12561
Fabian Groffen [Sun, 18 Jan 2009 15:03:35 +0000 (15:03 -0000)]
Detect invalid self-referencing install_names (sonames in the ELF world), such as libXaw is doing currently and hence breaking systems.
svn path=/main/branches/prefix/; revision=12528
Fabian Groffen [Sat, 17 Jan 2009 16:58:20 +0000 (16:58 -0000)]
Merged from trunk -r12520:12524
| 12521 | Bug #255101 - Fix 'Permission denied' error handling in |
| zmedico | NewsManager.getUnreadItems(). If there's no permission to |
| | lock the unread file, skip the lock and try to read the file |
| | anyway. |
| 12522 | Revert chown behavior change from the previous commit, so |
| zmedico | that chown will not be called on a pre-existing file. |
| 12523 | Identify which package has unused local USE descriptions, in |
| zmedico | case more than one package is being scanned. Thanks to |
| | Thomas Sachau <tommy@g.o> for reporting. |
| 12524 | Fix false positive in the 'unused local USE-description' |
| zmedico | warning. Thanks to Alexis Ballier <aballier@g.o> for |
| | reporting. |
svn path=/main/branches/prefix/; revision=12527
Fabian Groffen [Sat, 17 Jan 2009 16:56:19 +0000 (16:56 -0000)]
Merged from trunk -r12492:12520
| 12494 | Simplify depgraph._select_pkg_from_graph() by using |
| zmedico | match_pkgs(). |
| 12495 | Bug #254860 - Inside _expand_new_virtuals(), generate |
| zmedico | instances of Atom instead of plain strings, so calling code |
| | can assume that only Atom instances will be returned when |
| | strict mode is enabled. |
| 12496 | Use a new 'usersync' feature to control dropping of |
| zmedico | privileges for --sync, since it's fairly common for people |
| | to have inconsistent permissions between $PORTDIR and |
| | contained files/directories. |
| 12497 | Bug #254860 - Add another missing str -> atom conversion |
| zmedico | inside _expand_new_virtuals(). |
| 12498 | Bug #254825 - Improve messages that are displayed when |
| zmedico | manifest generation bails out due to a changed distfile |
| | digest. |
| 12499 | Inside digestgen(), don't unnecessarily call fetch() in |
| zmedico | cases when the there are no hashes for comparison and the |
| | file already exists in $DISTDIR. |
| 12500 | Bug #254825 - Add a note about the need to use `ebuild |
| zmedico | --force manifest` to update distfiles digests. |
| 12501 | In spawn(), put the full cpv in opt_name, instead of just |
| zmedico | $PF. Thanks to Diego Pettenò <flameeyes@g.o> for the |
| | suggestion. |
| 12502 | Make sure spawn() always initializes opt_name because later |
| zmedico | code assumes that it is. |
| 12503 | Add some more variables to config._env_blacklist to ensure |
| zmedico | that they never leak in from the calling environment. |
| 12514 | Fix repoman conditionals inside _expand_new_virtuals() to |
| zmedico | use config.local_config instead of checking for portdbapi |
| | type. |
| 12518 | Don't show the running Linux kernel version in the commit |
| zmedico | message, since it might leak information that would be |
| | useful to attackers. Thanks to Ned Ludd <solar@g.o> for the |
| | suggestion. |
| 12519 | Drop the kernel version from the commit message for all |
| zmedico | platforms. Thanks to Fabian Groffen <grobian@g.o> for the |
| | suggestion. |
| 12520 | Call depgraph._set_args() inside _load_favorites(), to |
| zmedico | eliminate duplicate code. |
svn path=/main/branches/prefix/; revision=12526
Fabian Groffen [Sat, 17 Jan 2009 16:53:47 +0000 (16:53 -0000)]
Merged from trunk -r12425:12492
| 12426 | Fix a TypeError which occurs in pretend commit mode when vcs |
| zmedico | is None. Thanks to Fabian Groffen <grobian@g.o> for |
| | reporting. |
| 12427 | Make the greedy slot atom code from bug #150361 look ahead |
| zmedico | for conflicts between the packages that will be pulled in. |
| | If a conflict is discovered, drop the greedy slot atom for |
| | the older slot. This solves a problem reported by kde4 users |
| | when running `emerge -u ` for a package that has the |
| | kdeprefix flag disabled. In this case, the newer slot blocks |
| | the older slot. In order to allow the older slot to be |
| | automatically uninstalled, the atom for the older slot needs |
| | to be excluded from the graph. Thanks to Maciej Mrozowski |
| | for testing this patch. |
| 12428 | Bug #241808 - When loading options for --resume, discard the |
| zmedico | --color option so it doesn't override the current setting. |
| 12429 | Fix comment about the greedy slots code. |
| zmedico | |
| 12484 | Invalidate some more caches inside depgraph._set_args(). |
| zmedico | |
| 12486 | When checking for conflicts between packages inside |
| zmedico | depgraph._greedy_slots(), never double-check any of the |
| | pairs. |
| 12488 | Mention the blocker_lookahead parameter in the |
| zmedico | depgraph._greedy_slots() docstring. |
| 12490 | When selecting greedy package inside |
| zmedico | depgraph._greedy_slots(), make sure the selected packages |
| | have the same cp as the highest selected version. |
svn path=/main/branches/prefix/; revision=12525
Fabian Groffen [Sun, 11 Jan 2009 14:31:40 +0000 (14:31 -0000)]
Merged from trunk -r12420:12422
| 12421 | When displaying parents of unsolved blockers, prefer parents |
| zmedico | that are not directly involved in a conflict. |
| 12422 | If necessary, use /proc/loadavg to emulate os.getloadavg(). |
| zmedico | |
svn path=/main/branches/prefix/; revision=12425
Fabian Groffen [Sun, 11 Jan 2009 14:28:25 +0000 (14:28 -0000)]
Merged from trunk -r12404:12420
| 12405 | Add Blocker -> Blocked Package edges to |
| zmedico | depgraph._unsolvable_blockers since these edges will be |
| | useful for implementing an enhanced blocker display. |
| 12406 | Remove unused myblocker_parents variable inside |
| zmedico | depgraph._serialize_tasks(). |
| 12407 | Revert r12405 since it will be more convenient to use a |
| zmedico | separate graph to store blocked package edges. |
| 12408 | When there are unresolved blockers, display the conflicting |
| zmedico | packages along with the packages that pulled them in |
| | (similar to the slot conflict display). This is helpful for |
| | troubleshooting cases in which blockers don't solve |
| | automatically and the reasons are not apparent from the |
| | normal merge list display. |
| 12409 | * Enable the recursive option in profile package.use |
| zmedico | parsing. * Enable package.umask in all the same locations as |
| | package.mask. |
| 12410 | Bug #55321 - Add support for package.keywords in profiles. |
| zmedico | In profiles, package.keywords modifies effective KEYWORDS |
| | values for a given ebuild. This behavior is notably |
| | different from /etc/portage/package.keywords, which instead |
| | modifies effective ACCEPT_KEYWORDS. |
| 12411 | Enable package.keywords as-directory in profiles. |
| zmedico | |
| 12412 | Fix broken code inside config._getKeywords(). |
| zmedico | |
| 12413 | Add a new 'metadata.warning' category and a check which |
| zmedico | detects local USE descriptions that are not used in any |
| | ebuilds. Thanks to Markus Meier <maekke@g.o> for the initial |
| | patch. |
| 12414 | Inside config._getKeywords(), ignore -* in KEYWORDS, to |
| zmedico | prevent it from causing preceeding values to be discarded. |
| 12415 | Use ebegin/eend to indicate when waiting for a lock and when |
| zmedico | it's acquired. Thanks to Petteri Räty <belegeuse@g.o> for |
| | the suggestion. |
| 12416 | Add a "quiet" parameter to the EOutput constructor, and also |
| zmedico | flush stderr/stdout stream in the constructor. |
| 12417 | Inside action_sync(), check for the git binary when |
| zmedico | necessary and bail out with a helpful message if it doesn't |
| | exist. Thanks to Caleb Cushing <xenoterracide@gmail.com> for |
| | the initial patch. |
| 12418 | Bug #254421 - Make dir_get_metadata() handle 'Connection |
| zmedico | refused' socket.error from ftplib connection attempt. |
| 12419 | Enable use.{mask,force} and package.use.{mask,forc} |
| zmedico | as-directory in profiles. |
| 12420 | When displaying parents of unsolved blockers, reduce noise |
| zmedico | by pruning packages that are only pulled in by other |
| | conflict packages. |
svn path=/main/branches/prefix/; revision=12424
Fabian Groffen [Sun, 11 Jan 2009 14:24:06 +0000 (14:24 -0000)]
Merged from trunk -r12396:12404
| 12397 | Bug #253745 - Note that you need to ensure that neither |
| zmedico | protect-owned nor collision-protect are enabled if you want |
| | to disable collision protection completely. |
| 12398 | Bug #253800 - Fix FETCHCOMMAND examples for SRC_URI arrow |
| zmedico | compatibility. |
| 12399 | Bug #253745 - Remove collision-protect from the sample |
| zmedico | FEATURES list since protect-owned is enabled by default now. |
| 12400 | Add some blank lines around the messages that suggest |
| zmedico | --without-mask and --include-dev. Thanks to Ryan Hill |
| | <dirtyepic@g.o> for the suggestion. |
| 12401 | Bug #253563 - Replace hardcoded green/red color strings with |
| zmedico | GOOD/BAD. Thanks to Vsevolod Kozlov <sevakda@gmail.com> for |
| | the initial patch. |
| 12402 | Make die() to show a message indicating the repository that |
| zmedico | an ebuild came from, and do it during any phase for both |
| | ebuilds and binary packages. Now PORTAGE_REPO_NAME is |
| | initialized inside config.setcpv() for both ebuilds and |
| | binary packages, so it's always available inside ebuild.sh. |
| 12403 | When merging a package from an overlay, append 'from |
| zmedico | $repository' to the '>>> Emerging' message (where |
| | $repository is the repo_name of the source repository). |
| | Thanks to Jeroen Roovers <jer@g.o> for the suggestion. |
| 12404 | Don't assume that the package metadata contains a |
| zmedico | "repository" key. |
svn path=/main/branches/prefix/; revision=12423
Fabian Groffen [Thu, 8 Jan 2009 20:13:34 +0000 (20:13 -0000)]
Merged from trunk -r12384:12389
| 12385 | Bug #252354 - Ensure that hardlinked files are not processed |
| zmedico | multiple times when necessary. |
| 12386 | Fix quoting for variable assignment with eval, from previous |
| zmedico | commit. |
| 12387 | For completeness, ensure that any INODE_* are unset before |
| zmedico | beginning. |
| 12388 | Bug #254114 - Fix ValueError triggered by missing COUNTER. |
| zmedico | Also, fix broken mtime check inside FakeVartree._sync(). |
| 12389 | Bug #250469 - Fix unpack() so that deb2targz is called in a |
| zmedico | way such that $DISTDIR write access is not required. |
svn path=/main/branches/prefix/; revision=12396
Fabian Groffen [Thu, 8 Jan 2009 20:09:55 +0000 (20:09 -0000)]
Merged from trunk -r12380:12384
| 12381 | Do not hardlink files unless they are in the same directory, |
| zmedico | since otherwise tar may not be able to extract a tarball of |
| | the resulting hardlinks due to 'Invalid cross-device link' |
| | errors (depends on layout of mount points). Also, don't |
| | hardlink zero-byte files since it doesn't save any space. |
| | Thanks to Daniel Robbins for reporting these issues which |
| | were noticed by funtoo users when attempting to extract |
| | stage tarballs. |
| 12382 | Remove print statement from previous commit. |
| zmedico | |
| 12383 | Fix _setitem() to write the same format that's currently |
| zmedico | distributed in the rsync tree. |
| 12384 | When the set configuration is incomplete, notify the user |
| zmedico | that this usually means /usr/share/portage/config/sets.conf |
| | is missing or corrupt. |
svn path=/main/branches/prefix/; revision=12395
Fabian Groffen [Thu, 8 Jan 2009 20:06:46 +0000 (20:06 -0000)]
Merged from trunk -r12375:12380
| 12376 | Bug #253336 - Set PORTAGE_VERBOSE=1 so that files are |
| zmedico | displayed as they are merge. |
| 12377 | Fix the 'Unrecognized configure options' check for |
| zmedico | compatibility with output produced by Autoconf 2.63. Thanks |
| | to Arfrever Frehtes Taifersar Arahesis for reporting. |
| 12378 | Inside action_sync(), when running as root, detect if |
| zmedico | $PORTDIR has non-root uid/gid bits and drop privileges to |
| | match the existing bits if appropriate. |
| 12379 | Bug #253467 - Don't allow alien $A values to leak into the |
| zmedico | ebuild environment. |
| 12380 | When dropping privileges inside action_sync(), set the umask |
| zmedico | to preserve the group write bit if appropriate. |
svn path=/main/branches/prefix/; revision=12394
Fabian Groffen [Thu, 8 Jan 2009 20:02:34 +0000 (20:02 -0000)]
Merged from trunk -r12371:12375
| 12373 | dont force people to match leading $D in STRIP_MASK |
| SpankMan | |
| 12374 | export STRIP_MASK automatically |
| SpankMan | |
| 12375 | - tell the user where we unpacked the source |
| solar | |
svn path=/main/branches/prefix/; revision=12393
Fabian Groffen [Thu, 8 Jan 2009 20:00:32 +0000 (20:00 -0000)]
Merged from trunk -r12367:12371
| 12368 | Handle tree conflicts in svn status output, new in |
| zmedico | subversion 1.6. Thanks to Arfrever Frehtes Taifersar |
| | Arahesis for reporting. |
| 12369 | Bug #252995 - When post_emerge() returns early because the |
| zmedico | vdb state has not changed, still display new notifications. |
| 12370 | Bug #252985 - Add a note about the new default behavior for |
| zmedico | `emerge world` and `emerge system` commands. |
| 12371 | Bug #253210 - Fix logic inside EbuildBuild._buildpkg_exit() |
| zmedico | to avoid triggering an AssertionError when the package phase |
| | has failed. This bug usually isn't noticeable since the |
| | package phase usually succeeds. |
svn path=/main/branches/prefix/; revision=12392
Fabian Groffen [Thu, 8 Jan 2009 19:57:19 +0000 (19:57 -0000)]
Merged from trunk -r12352:12367
| 12359 | Bug #252727 - Use `git diff-index --name-only |
| zmedico | --diff-filter=M HEAD` instead of `git ls-files -m |
| | --with-tree=HEAD` since the latter doesn't behave like we |
| | want for files that have been added to the index. Also, use |
| | `git diff-index` instead of `git diff` since the latter is |
| | considered a high-level "porcelain" command which means that |
| | it's interface may not be reliable. |
| 12360 | Inside git_sync_timestamps(), use git-diff-index for the |
| zmedico | same reason that repoman now uses it since bug #252727. |
| 12361 | Wrap lines to 80 columns and remove extra blank lines. |
| zmedico | |
| 12362 | Add notes about FEATURES=protect-owned and move the note |
| zmedico | about --complete-graph to NEWS. |
| 12363 | Bug #252840 - Fix TypeError which is triggered by a broken |
| zmedico | override of varnings.formatwarning(). Override |
| | warnings.showwarning() instead since the api docs say it may |
| | be overriden while they do not say this about |
| | formatwarning(). |
| 12364 | Inside _showwarning(), import sys since otherwise it's None |
| zmedico | for some reason. |
| 12365 | Bug #253002 - Add a new variable.invalidchar check for |
| zmedico | metadata variables that contain characters that are not part |
| | of the ASCII character set. |
| 12366 | Fix 'TypeError: not all arguments converted during string |
| zmedico | formatting' triggered by repoman -v. Thanks to Javier |
| | Villavicencio <the_paya@g.o> for reporting. |
| 12367 | Specify that metadata variable values should only contain |
| zmedico | ASCII as per GLEP 31. |
svn path=/main/branches/prefix/; revision=12391
Fabian Groffen [Thu, 8 Jan 2009 19:52:54 +0000 (19:52 -0000)]
Merged from trunk -r12347:12352
| 12348 | Bug #252572 - Fix a loop condition inside |
| zmedico | depgraph._serialize_tasks() which can cause an infinite loop |
| | that's triggered by unresolvable blockers. |
| 12349 | Fix loop logic some more for bug #252572. |
| zmedico | |
| 12350 | Bail out earlier if the file name argument doesn't end with |
| zmedico | '.ebuild'. Thanks to Diego 'Flameeyes' Pettenò for |
| | reporting. |
| 12351 | Bug #252562 - Show --onlydeps in short --help output. |
| zmedico | |
| 12352 | Revert r12348 since it's not really needed and the previous |
| zmedico | version is more efficient. |
svn path=/main/branches/prefix/; revision=12390
Fabian Groffen [Thu, 25 Dec 2008 13:50:16 +0000 (13:50 -0000)]
Merged from trunk -r12302:12345
| 12303 | Add support for synchronizing ebuild and eclass timestamps |
| zmedico | with the metadata cache timestamps which emerge --sync |
| | operates on a git repository. This is necessary since git |
| | doesn't preserve timestamps. It is assumed that the |
| | timestamps should be synchronized if the relevant ebuilds |
| | and eclasses are unmodified relative to the HEAD commit (as |
| | reported by git-ls-files). This feature was requested by |
| | Daniel Robbins, so that it's possible for the funtoo git |
| | repository to distribute pre-generated metadata. |
| 12327 | Inside mirror_cache(), handle unsupported EAPI like |
| zmedico | portdbapi does. |
| 12328 | Don't add any more that one "-" symbol to the front of an |
| zmedico | unsupported EAPI. |
| 12329 | Handle potential KeyErrors that may be raised from |
| zmedico | get_eclass_data(), and remove unnecessary print statements |
| | inside get_eclass_data(). |
| 12330 | Inside portdbapi._metadata_callback(), preserve _eclasses_ |
| zmedico | when the EAPI is unsupported since the eclass timestamps |
| | might be needed in order to decide that the cache entry |
| | should be regenerated. Also, make sure that all metadata |
| | returned from portdbapi.aux_get() is returned as empty |
| | strings when the EAPI is unsupported. |
| 12331 | Make vardbapi._aux_get() return _mtime_ as a long (never as |
| zmedico | a float). |
| 12332 | Use long() instead of float() when parsing Package.mtime |
| zmedico | from the metadata. |
| 12339 | Refactor EbuildMetadataPhase._output_handler() and |
| zmedico | _set_returncode(). |
| 12341 | Fix typo. |
| zmedico | |
| 12345 | scan archives of objects for exec stacks |
| SpankMan | |
svn path=/main/branches/prefix/; revision=12347
Fabian Groffen [Thu, 25 Dec 2008 13:42:28 +0000 (13:42 -0000)]
Merged from trunk -r12288:12302
| 12289 | Rename the PollTask class to AbstractPollTask. |
| zmedico | |
| 12290 | Move initial signal handlers to the launcher script. |
| zmedico | |
| 12291 | Make more code conditional on POLLIN events, where |
| zmedico | appropriate. |
| 12292 | Add SIGUSR1 signal handlers that call pdb.set_trace(). |
| zmedico | Thanks to Brian Harring for the suggestion. |
| 12293 | Bug #252304 - Restore the -V/--version option. |
| zmedico | |
| 12294 | Fix broken PATH comparisons when eliminating duplicate |
| zmedico | entries inside binarytree.inject(). |
| 12295 | Fix PATH comparison in binarytree.inject() some more. |
| zmedico | |
| 12296 | Bug #251976 - Add a QA_PRESTRIPPED variable for ebuilds to |
| zmedico | disable warnings about pre-stripped files. |
| 12297 | Replace QA_DT_HASH with QA_PRESTRIPPED where appropriate. |
| zmedico | Thanks to Arfrever for reporting. Also, remove array support |
| | since bash arrays don't export anyway. |
| 12298 | Fix typo. |
| zmedico | |
| 12299 | Document QA_STRICT_PRESTRIPPED. |
| zmedico | |
| 12300 | Don't use 'local' builtin outside of a function. |
| zmedico | |
| 12301 | Bug #252374 - Warn if FEATURES=fakeroot is enabled, but the |
| zmedico | fakeroot binary is not installed. |
| 12302 | Make BinpkgFetcher use longs instead of floats when |
| zmedico | synchronizing timestamps, since it's better not to rely on |
| | float comparison here. |
svn path=/main/branches/prefix/; revision=12346
Fabian Groffen [Tue, 23 Dec 2008 20:53:16 +0000 (20:53 -0000)]
Merged from trunk -r12286:12287
| 12287 | Add handling for POLLERR, POLLNVAL, and POLLHUP. Hopefully |
| zmedico | this solves hung poll calls with defunct ebuild.sh |
| | processes, reported on solaris systems by Fabian Groffen |
| | <grobian@g.o>. |
svn path=/main/branches/prefix/; revision=12288
Fabian Groffen [Tue, 23 Dec 2008 19:01:45 +0000 (19:01 -0000)]
Merged from trunk -r12282:12285
| 12285 | Register for poll events before forking, in order to avoid |
| zmedico | potential race conditions in SpawnProcess._start() and |
| | EbuildMetadataPhase._start(). Hopefully this solves hung |
| | poll calls with defunct ebuild.sh processes, reported on |
| | solaris systems by Fabian Groffen <grobian@g.o>. |
svn path=/main/branches/prefix/; revision=12286
Fabian Groffen [Tue, 23 Dec 2008 18:37:53 +0000 (18:37 -0000)]
Merged from trunk -r12277:12282
| 12278 | Bug #252167 - If the ebuild no longer exists or it's |
| zmedico | keywords have been dropped, reject built instances |
| | (installed or binary). If --usepkgonly is enabled, assume |
| | that the ebuild status should be ignored. |
| 12279 | Simplify the code from bug #218854. Also, ensure that the |
| zmedico | set of visible packages thats used by |
| | depgraph._iter_atoms_for_pkg() is consistent with the |
| | packages that have been selected by |
| | depgraph._select_pkg_highest_available(). This should |
| | correct potential inconstencies introduced by the package |
| | selection changes from bug #252167. |
| 12280 | Bug #252243 - Fix binarytree.prevent_collision() so that it |
| zmedico | won't create a circular symlink if there happens to be a |
| | symlink in $PKGDIR/All for some reason. |
| 12281 | Fix typo. |
| zmedico | |
| 12282 | When removing entries with duplicate paths inside |
| zmedico | binarytree.inject(), handle path collisions in $PKGDIR/All |
| | when CPV is not identical. |
svn path=/main/branches/prefix/; revision=12284
Fabian Groffen [Tue, 23 Dec 2008 18:33:43 +0000 (18:33 -0000)]
strip out prefix to make it work properly, thanks Zac for the notification
svn path=/main/branches/prefix/; revision=12283
Fabian Groffen [Mon, 22 Dec 2008 21:24:32 +0000 (21:24 -0000)]
also catch windos *.dll files to make them executable, works according to mduft...
svn path=/main/branches/prefix/; revision=12277
Fabian Groffen [Mon, 22 Dec 2008 20:26:45 +0000 (20:26 -0000)]
Merged from trunk -r12256:12275
| 12257 | Inside display_preserved_libs(), filter out consumers that |
| zmedico | belong to the same package as the provider only if those |
| | consumers are also preserved. |
| 12258 | Fix DependencyArg.__str__() to ensure that str type is |
| zmedico | always returned. |
| 12259 | Bug #251616 - Inside _check_build_log(), remove unnecessary |
| zmedico | .* patterns from regular expressions. These patterns trigger |
| | extreme performance issues when matched against extremely |
| | large lines such as those produced by dev-util/bzr test |
| | suite when it uses \r to rewrite the same line thousands of |
| | times. |
| 12260 | Bug #251591 - Adjust the InheritAutotools pattern to treat |
| zmedico | more things similar to whitespace. Now it recognizes escaped |
| | newlines, || operators, and && operators. |
| 12264 | Simplify the InheritAutotools pattern by using \b to match |
| zmedico | word boundaries. |
| 12265 | Adjust the EbuildNestedDie pattern so that it only matches |
| zmedico | when ( is surrounded by whitespace. This filters out false |
| | positives triggered by sed expressions in |
| | net-analyzer/amap-5.2-r1 and |
| | media-libs/libsndfile-1.0.17-r1. Thanks to Diego Pettenò |
| | <flameeyes@g.o> for reporting. |
| 12270 | Remove the TaskScheduler.run() method since the constructor |
| zmedico | replaces it with the QueueScheduler.run() method. |
| 12271 | Update --depclean 'unsatisfied deps' message to recommend |
| zmedico | the same emerge update command that's recommended earlier. |
| | Thanks to Jeremy Olexa <darkside@g.o> for reporting. |
| 12272 | Fix --clean so that it considers all packages within a given |
| zmedico | slot when it's deciding which packages to keep, rather than |
| | just considering the ones matched by the given atom. Any |
| | packages not matching the given atom are protected from |
| | being unmerged. Thanks to Mart Raudsepp <leio@g.o> for |
| | reporting. |
| 12273 | Add support for the new DEFINED_PHASES metadata key which is |
| zmedico | automatically generated from the set of phase functions that |
| | are defined by the ebuild and any eclasses it may have |
| | inherited. |
| 12274 | Fix DEFINED_PHASES code to check for pkg_config and pkg_info |
| zmedico | functions. |
| 12275 | Remove code from unused config.load_infodir() method and |
| zmedico | issue a deprecation warning if it's called. |
svn path=/main/branches/prefix/; revision=12276
Fabian Groffen [Tue, 16 Dec 2008 18:31:32 +0000 (18:31 -0000)]
Merged from trunk -r12248:12253
| 12251 | Bug #250902 - Inside dblink._find_libs_to_preserve(), |
| zmedico | prevent symlinks from being erroneously preserved by |
| | themselves when the old instance installed symlinks that the |
| | new instance does not install. |
| 12252 | Bug #250902 - Inside dblink._find_unused_preserved_libs(), |
| zmedico | show a warning instead of raising a KeyError if the |
| | preserved libs registry contains a symlink that points to a |
| | lib which is not preserved. |
| 12253 | Inside display_preserved_libs(), filter out any consumers |
| zmedico | that belong to the same package as the provider. |
svn path=/main/branches/prefix/; revision=12256
Fabian Groffen [Tue, 16 Dec 2008 18:29:15 +0000 (18:29 -0000)]
Merged from trunk -r12200:12248
| 12201 | Make BinpkgFetcher synchronize the local timestamp of the |
| zmedico | downloaded file with the remote file, if the fetcher hasn't |
| | done it automatically. |
| 12202 | Fix exit code to return non-zero when an error occurs. |
| zmedico | Thanks to Christoph Mende <angelos@g.o> for reporting. |
| 12204 | Remove stray part about 'link level dependency awareness' in |
| zmedico | the 2.1.6 section and remove extraneous line 8. Thanks to |
| | Arun Raghavan <ford_prefect@g.g> for reporting. |
| 12205 | Add --sync support for `git pull`, and also add a failsafe |
| zmedico | to prevent rsync from being called if $PORTDIR appears to be |
| | under revision control. Thanks to Daniel Robbins for the |
| | initial patch. |
| 12206 | Don't warn about missing repo_name for $PORTDIR when it |
| zmedico | happens to be empty. |
| 12207 | Fix --getbinpkgonly behavior so that binaries from the |
| zmedico | remote server are preferred over local packages if they are |
| | not identical. Thanks to Lance Albertson <ramereth@g.o> for |
| | reporting. |
| 12208 | Fix old-style binhost code binarytree.digestCheck() will use |
| zmedico | local digests when a local package overrides a remote one. |
| 12209 | When using the old binhost protocol, comparison with the |
| zmedico | remote package isn't supported, so the local package is |
| | always preferred even if --getbinpkgonly is enabled. |
| | Simplify bintree.isremote() so it works the same way |
| | regardless of which protocol is used. |
| 12210 | Fix incorrect usage of trap (only remove on signal at a |
| zmedico | time). |
| 12211 | Fix breakage in stale metadata logic inside |
| zmedico | binarytree._poplulate(). |
| 12212 | Fix --getbinpkg to behave as expected with --pretend and |
| zmedico | --fetchonly. |
| 12213 | Fix --pretend logic in Binpkg some more. |
| zmedico | |
| 12214 | Add a new FEATURES=test-fail-continue value which causes |
| zmedico | ebuild execution to continue after the test phase has |
| | failed. Thanks to Diego Pettenò <flameeyes@g.o> for the |
| | suggestion. |
| 12246 | Update comment about resume opts stored as dict starting |
| zmedico | with 2.1.6_rc1. |
| 12248 | Detect problems with arguments and return non-zero when |
| zmedico | appropriate. |
svn path=/main/branches/prefix/; revision=12255
Fabian Groffen [Tue, 16 Dec 2008 18:25:18 +0000 (18:25 -0000)]
Merged from trunk -r12182:12200
| 12183 | For py3k compat, remove Package.__cmp__() and related cmp() |
| zmedico | function call. |
| 12184 | For py3k compat, avoid using list.sort(cmp). |
| zmedico | |
| 12185 | When in --debug mode, make the depgraph call |
| zmedico | self.digraph.debug_print() to display the final digraph |
| | state. This should help when troubleshooting problems with |
| | blockers that don't resolve automatically, by making it |
| | easier to see what pulled in unwanted packages. |
| 12186 | Bug #250166 - To avoid accidental regeneration of digests |
| zmedico | with the incorrect files (such as partially downloaded |
| | files), trigger the fetch code if the file exists and it's |
| | size doesn't match the current manifest entry. If there |
| | really is a legitimate reason for the digest to change, |
| | `ebuild --force digest` can be used to avoid triggering this |
| | code (or else the old digests can be manually removed from |
| | the Manifest). |
| 12187 | Simplify the code from bug #250166. |
| zmedico | |
| 12188 | In digestgen(), don't call fetch for files that already |
| zmedico | exist but have invalid zero-size in the manifest. |
| 12189 | Bug #250148 - Prevent ebuild.sh subprocess from inheriting |
| zmedico | file descriptor 9, since otherwise if a daemon process such |
| | as udevd gets spawned then it can inherit the file |
| | descriptor and hang emerge. |
| 12190 | When attempting to close fd 9 at the end of the depend |
| zmedico | phase, use exec so that it really works. |
| 12191 | When processing output from the "depend" phase, use the |
| zmedico | number of lines as a sanity check so that bash's returncode |
| | doesn't have to be trusted. |
| 12192 | urlparse.urljoin() only works correctly with recognized |
| zmedico | protocols and requires the base url to have a trailing |
| | slash, so join PORTAGE_BINHOST manually. Thanks to Lance |
| | Albertson <ramereth@g.o> for reporting. |
| 12193 | When the Binpkg class has fetched a package in --fetchonly |
| zmedico | mode, wait until after the package is verified and injected |
| | before returning. |
| 12194 | Create a BinpkgPrefetcher composite task to handle fetch, |
| zmedico | verification, and injection. |
| 12195 | Verify binary packages even when not in "strict" mode |
| zmedico | (normal distfiles are also verified in this case). |
| 12196 | Make the Binpkg class handle fetch logging similar to how |
| zmedico | EbuildBuild does, directing output to PORTAGE_LOG_FILE |
| | instead of emerge-fetch.log which is only used for |
| | prefetchers now. |
| 12197 | Make BinpkgVerifier rename files that fail verification, |
| zmedico | similar to how distfiles are automatically renamed. |
| 12198 | Make Binpkg clean the build dir immediately after locking |
| zmedico | it. This ensures that a new PORTAGE_LOG_FILE is created. |
| 12199 | For py3k compat, remove Atom.__cmp__() and use str.__lt__() |
| zmedico | instead. |
| 12200 | Remove ManifestEntry.__cmp__() since it's not needed and |
| zmedico | py3k won't use it. |
svn path=/main/branches/prefix/; revision=12254
Fabian Groffen [Mon, 8 Dec 2008 21:24:31 +0000 (21:24 -0000)]
Merged from trunk -r12173:12181
| 12174 | If pkg_nofetch needs to be spawned inside fetch() and it |
| zmedico | happens that PORTAGE_BUILDDIR doesn't exist, like when |
| | called by digestgen(), use mkdtemp to create a private |
| | temporary directory so that pkg_nofetch can be spawned |
| | (directory needed to satisfy safe $PWD requirement of bug |
| | #239560). This is more user friendly since before the |
| | pkg_nofetch phase would simply be skipped in this case. |
| | Thanks to Petteri Räty <betelgeuse@g.o> for reporting. |
| 12176 | Bug #249586 - Use writemsg() to send output to stderr |
| zmedico | instead of stdout. |
| 12179 | Bug #250212 - Add a new 'upstream.workaround' qa category, |
| zmedico | and use it for the EMakeParallelDisabled check. Thanks to |
| | Mike Auty <ikelos@g.o> for this patch. |
| 12180 | Avoid TypeError in BlockerCache.__iter__() that's triggered |
| zmedico | with FEATURES=python-trace. Thanks to Fabian Groffen |
| | <grobian@g.o> for reporting. |
| 12181 | Fix deprecated_profile_check() to account for |
| zmedico | PORTAGE_CONFIGROOT. Thanks to Jeremy Olexa <darkside@g.o> |
| | for the initial patch. |
svn path=/main/branches/prefix/; revision=12182
Fabian Groffen [Sat, 6 Dec 2008 20:57:30 +0000 (20:57 -0000)]
Merged from trunk -r12165:12168
| 12166 | Validate $ROOT inside the --resume merge list in order to |
| zmedico | avoid a pottential KeyError due to a stale merge list that |
| | was for a different $ROOT setting. Thanks to Ned Ludd |
| | <solar@g.o> for reporting. |
| 12168 | Add docs for PORTAGE_GPG_DIR and PORTAGE_GPG_KEY that are |
| zmedico | used by repoman for FEATURES=sign support. Thanks to Petteri |
| | Räty <betelgeuse@g.o> for reporting. |
svn path=/main/branches/prefix/; revision=12172
Fabian Groffen [Sat, 6 Dec 2008 20:54:55 +0000 (20:54 -0000)]
fix backtrace on unmerge by preventing to unmerge the prefix offset path itself, thanks zmedico for the initial patch
svn path=/main/branches/prefix/; revision=12171
Fabian Groffen [Sat, 6 Dec 2008 20:52:14 +0000 (20:52 -0000)]
Implementing a workaround for a problem found by darkside:
http://archives.gentoo.org/gentoo-alt/msg_fdb765f2e49f7bcad828a06b994f15be.xml
Just temporarily make to be stripped objects writable, if they are not,
to have strip succeed in doing its job.
svn path=/main/branches/prefix/; revision=12170
Fabian Groffen [Fri, 5 Dec 2008 21:32:20 +0000 (21:32 -0000)]
Makefile.am: installing `./COPYING' using GNU General Public License v3 file
Makefile.am: Consider adding the COPYING file to the version control system
Makefile.am: for your code, to avoid questions about which license your project uses.
Adding GPLv2 licence because we don't do GPLv3.
svn path=/main/branches/prefix/; revision=12165
Fabian Groffen [Fri, 5 Dec 2008 21:26:21 +0000 (21:26 -0000)]
Merged from trunk -r12146:12161
| 12148 | Bug #249185 - For common cases in which USE deps trigger |
| zmedico | SLOT conflicts, give a short explanation and suggest a |
| | course of action to solve the problem. |
| 12150 | Make sure depgraph._slot_conflict_explanation() doesn't |
| zmedico | display the same atom more than once. |
| 12152 | Bug #249805 - Add some more |
| zmedico | PreservedLibsRegistry.pruneNonExisting() calls, to avoid a |
| | KeyError from LinkageMap.findConsumers() triggered inside |
| | display_preserved_libs(). |
| 12153 | Enable FEATURES=fixpackages by default since the performance |
| zmedico | is pretty reasonable now. Thanks to Jeremy Olexa |
| | <darkside@g.o> for the suggestion. |
| 12154 | Sync with 2.1.6 branch. |
| zmedico | |
| 12155 | FEATURES=fixpackages is now enabled by default |
| zmedico | |
| 12157 | Make fixpackages less noisy by only generting '*' characters |
| zmedico | for packages that are modified by updates. |
| 12159 | Make fixpackages use a new "#" symbol for /var/db updates |
| zmedico | (previously '*' which means 'binary update' was used). |
svn path=/main/branches/prefix/; revision=12164
Fabian Groffen [Fri, 5 Dec 2008 21:22:55 +0000 (21:22 -0000)]
Merged from trunk -r12133:12146
| 12134 | Source bashrc files as late as possible, giving them the |
| zmedico | opportunity to override as much as possible. Thanks to Ned |
| | Ludd <solar@g.o> for the suggestion. |
| 12136 | Skip sourcinf of profile.bashrc during the depend phase. |
| zmedico | |
| 12138 | Fix depgraph._dep_check_composite_db._visible() to reject |
| zmedico | installed packages that are masked. This is necessary for |
| | correct choices in || deps when we want to ensure that |
| | installed masked packages are not preferred over other |
| | available choices that are not masked. Thanks to Jan |
| | Kundrát <jkt@g.o> for reporting this issue and testing the |
| | patch. |
| 12140 | When calling `git ls-files -m` to list modified files, use |
| zmedico | --with-tree=HEAD so that differences from the most recent |
| | commit are given instead of differences from the index which |
| | is used for commit staging purposes. This is required since |
| | otherwise files that have been added via `git add` (such as |
| | echangelog does with the ChangeLog) won't show up in the |
| | list of modified files due to being unmodified relative to |
| | the index. Thanks to Christian Ruppert (idl0r) for |
| | reporting. |
| 12142 | It's not safe to use the git commit -a option since there |
| zmedico | might be some modified files elsewhere in the working tree |
| | that the user doesn't want to commit. Therefore, call git |
| | update-index in order to ensure that the index is updated |
| | with the latest versions of all new and modified files in |
| | the relevant portion of the working tree. |
| 12144 | When --keep-going drops packages due to unsatisfied |
| zmedico | dependencies, include them in the list of packgaes that |
| | "failed to build or install" that's displayed at the end. |
| 12146 | Break references between the depgraph and the dropped tasks |
| zmedico | inside Scheduler._calc_resume_list(), since the tasks are |
| | now saved for display at the end. |
svn path=/main/branches/prefix/; revision=12163
Fabian Groffen [Mon, 1 Dec 2008 21:14:48 +0000 (21:14 -0000)]
Merged from trunk -r12117:12126
| 12120 | Add 'automatically resolved' blockers to the --pretend docs. |
| zmedico | |
| 12122 | Add a sanity check inside depgraph._add_pkg() to ensure that |
| zmedico | the dependencies of the same package are never processed |
| | more than once. |
| 12124 | Change depgraph._slot_collision_info() from a set to a dict |
| zmedico | that contains sets of packages pulled into a given slot. |
| | This will make the data easier to analyze when implementing |
| | a fix for bug #249185. |
| 12125 | Bug #249185 - For more useful output in cases when one or |
| zmedico | more USE deps trigger "SLOT conflicts", show the specific |
| | atoms that triggered the conflict. TODO: Distiguish between |
| | various possible causes and tailor messages to suit them. |
| 12126 | Fix inconsistencies between the "clean" and "cleanrm" |
| zmedico | phases. |
svn path=/main/branches/prefix/; revision=12133
Fabian Groffen [Mon, 1 Dec 2008 21:10:53 +0000 (21:10 -0000)]
Merged from trunk -r12086:12117
| 12090 | Note that file names in /etc/portage/package.* directories |
| zmedico | are sorted ascending alphabetical order before being summed |
| | together. |
| 12092 | Bug #248782 - Handle permission error in |
| zmedico | EbuildFetchonly.execute() if PORTAGE_TMPDIR is not writable. |
| 12094 | Bug #248464 - With git, there's never any keyword expansion, |
| zmedico | so there's no need to regenerate manifests and all files |
| | will be committed in one big commit at the end. |
| 12096 | Remove redundant reference to 'mynew' since 'myupdates' |
| zmedico | already contains those files. |
| 12098 | Eliminate redundant Manifest separation code by combining |
| zmedico | mychanged + mynew sooner. |
| 12101 | Add some more clarification to the 'ebuild phase exited |
| zmedico | unexpectedly' message. |
| 12103 | Make Scheduler.merge() bail out early if PORTAGE_TMPDIR is |
| zmedico | not properly set. |
| 12105 | Bug #205044 - When creating $EBUILD_EXIT_STATUS_FILE, don't |
| zmedico | direct output to /dev/null since it should never fail and if |
| | it does then the error message might be useful. |
| 12107 | Don't direct to /dev/null when creating |
| zmedico | $EBUILD_EXIT_STATUS_FILE inside die. |
| 12109 | Bug #235642 - Create hardlinks when merging identical files. |
| zmedico | This works by using a tuple of (md5, st_size) as a key to a |
| | list of hardlink candidates. Multiple candidates are used in |
| | case some happen to be merged to separate devices. |
| 12111 | In movefile(), ignore the hardlink_candidates parameter when |
| zmedico | it's an empty list. |
| 12113 | For bug #235642, include the stat mode, uid, and gid bits in |
| zmedico | the hardlink key. |
| 12115 | Don't call prepare_build_dirs() inside doebuild() when |
| zmedico | called for parallel fetching. |
| 12117 | Use stat st_dev attributes instead of the older approach. |
| zmedico | |
svn path=/main/branches/prefix/; revision=12132
Fabian Groffen [Mon, 1 Dec 2008 20:59:48 +0000 (20:59 -0000)]
Merged from trunk -r12057:12086
| 12059 | Document "I" which represents PROPERTIES=interactive in the |
| zmedico | merge list display. |
| 12061 | Use a table to organize the key of merge list display codes |
| zmedico | for the --pretend option. |
| 12063 | Use a table to organize the key of USE flag symbols for the |
| zmedico | --verbose option. |
| 12065 | Make emerge detect an invalid profile an bail out for |
| zmedico | anything except --help, --info, --sync, and --version |
| | actions. When bailing out, suggest to revert back to the |
| | previous profile configuration advise the user which actions |
| | are allowed with an invalid profile. |
| 12066 | Inside profile_check(), call validate_ebuild_environment() |
| zmedico | to generate some extra profile warnings when appropriate. |
| 12068 | Add support for parsing EAPI labels in contained in 'eapi' |
| zmedico | files in the profiles, and bail out if the profile contains |
| | an unsupported EAPI value in any one of it's directories. We |
| | don't necessarily have to use this but at least it gives us |
| | some way to make emerge bail out early if a profile contains |
| | unsupported EAPI features. |
| 12070 | Document the 'eapi' profile file. |
| zmedico | |
| 12072 | Fix typo in --help. |
| zmedico | |
| 12077 | Add one newline, to wrap the "Global Updates" key to less |
| zmedico | than 80 columns. |
| 12079 | Also add 2 spaces after newline, for alignment. |
| zmedico | |
| 12081 | Use tar options to make files owned in release tarballs |
| zmedico | owned by portage:portage instead of the current user. |
| 12086 | Remove world and system targets for emerge --help since it |
| zmedico | no longer works now that they are sets rather than actions. |
svn path=/main/branches/prefix/; revision=12131
Fabian Groffen [Mon, 1 Dec 2008 20:56:01 +0000 (20:56 -0000)]
Merged from trunk -r12040:12057
| 12041 | Add some hints about bash binary corruption and hardware |
| zmedico | malfunction to the message that's displayed when bash exits |
| | unexpectedly. |
| 12043 | Add new @unavailable package set which contains all |
| zmedico | installed packages for which there are no visible ebuilds |
| | corresponding to the same $CATEGORY/$PN:$SLOT. |
| 12044 | Add back accidentally removed @downgrade set. Thanks to |
| zmedico | Arfrever. |
| 12045 | When displaying anscestors of an unstatisfied dependency |
| zmedico | (code from bug #245358), avoid a potential infinite loop and |
| | memory leak triggered by circular dependencies. Thanks to |
| | Peter Weller <welp@g.o> for reporting. |
| 12047 | Add docs for all of the supported commands. |
| zmedico | |
| 12049 | Bug #247548 - Remove 'last' and 'lfull' commands since |
| zmedico | nobody uses them. Thanks to Alec Warner <antarus@g.o>. |
| 12051 | Fix the code from bug #245358 so that it's guaranteed to |
| zmedico | traverse all the way to a root node, even when circular deps |
| | are encountered. |
| 12053 | Bug #188780 - Make the read_int() function show a more human |
| zmedico | readable error message, instead of the 'value too great for |
| | base' message when the user enters an invalid value such as |
| | '1y'. |
| 12055 | Fix SIGINT and SIGTERM trap handling so the temp dir always |
| zmedico | cleaned up when killed. |
| 12057 | Add a note about negative IUSE default settings being |
| zmedico | ineffective given the default USE_ORDER setting which causes |
| | profile and user configuration settings to override them. |
svn path=/main/branches/prefix/; revision=12130
Fabian Groffen [Sat, 22 Nov 2008 11:39:03 +0000 (11:39 -0000)]
I am to blame for the Prefix part
svn path=/main/branches/prefix/; revision=12040
Fabian Groffen [Sat, 22 Nov 2008 11:36:32 +0000 (11:36 -0000)]
Merged from trunk -r12020:12033
| 12022 | Bug #247776 - Show a warning message if CONFIG_PROTECT is |
| zmedico | empty. |
| 12024 | Fix some cases in dep_zapdeps() where blocker atoms are |
| zmedico | inappropriately tested for availablity. Thanks to Jorge |
| | Manuel B. S. Vicetto <jmbsvicetto@g.o> for reporting. |
| 12026 | Add missing '%' symbol (for binary package moves) to the key |
| zmedico | that's displayed by _global_updates(). Thanks to Andrew |
| | Gaffney <agaffney@g.o> for reporting. |
| 12028 | Make sure the dict returned from _parse_data() contains all |
| zmedico | of _known_keys. |
| 12030 | Fix quoting on $CHANGELOG_REVISION. |
| zmedico | |
| 12033 | Add some people to the AUTHORS section. |
| zmedico | |
svn path=/main/branches/prefix/; revision=12039
Fabian Groffen [Sat, 22 Nov 2008 11:34:13 +0000 (11:34 -0000)]
Merged from trunk -r12004:12020
| 12006 | Bug #247370 - Use a private PORTAGE_TMPDIR for --fetchonly |
| zmedico | mode in order do avoid locking the normal build dir location |
| | (similar to bug #245231). The EbuildFetchPretend class is |
| | renamed to EbuildFetchonly and it's used for --fetchonly |
| | mode regardless of whether --pretend is enabled. Also, fix |
| | stdout/stderr flushing in JobStatusDisplay.displayMessage() |
| | and portage.spawn() to ensure output always occurs in the |
| | correct order when displaying pkg_nofetch() output in |
| | --fetchonly mode. |
| 12008 | Inside _parse_data(), don't rely on the magic 22 line count |
| zmedico | for the flat_list format, since it doesn't make a |
| | significant performance difference and it places an |
| | artificial limit on the number of keys that can be stored. |
| 12010 | Remove inappropriate backslash escaping inside |
| zmedico | _db_escape_string(). |
| 12012 | When given an ambiguous ebuild name to install, format the |
| zmedico | list of choices in emerge --search format if --quiet mode is |
| | not enabled, otherwise just show a brief list. Thanks to |
| | Markus Meier <maekke@g.o> for the suggestion. |
| 12014 | In JobStatusDisplay, always flush the output stream after |
| zmedico | writing to it. |
| 12016 | In EbuildProcess._start(), don't open the log file during |
| zmedico | the clean phase since the open file can result in an nfs |
| | lock on $T/build.log which prevents the clean phase from |
| | removing $T. Thanks to Jeremy Olexa <darkside@g.o> for |
| | reporting. |
| 12018 | Bug #248059 - In action_depclean(), ignore invalid atoms in |
| zmedico | deps of packages to be uninstalled. |
| 12020 | Bug #248059 - Make --depclean more tolerant of invalid atoms |
| zmedico | in dependencies of packages that will be uninstalled anyway. |
svn path=/main/branches/prefix/; revision=12038
Fabian Groffen [Sat, 22 Nov 2008 11:31:14 +0000 (11:31 -0000)]
Merged from trunk -r11982:12004
| 11984 | Bug #139134 - Make the flat_hash and metadata modules write |
| zmedico | the _mtime_ field inside the file instead of mangling the |
| | mtime of the cache entry file. Also, fix |
| | FsBased._ensure_access() to properly skip the utime() call |
| | when no mtime is passed in. Theses cache changes are |
| | compatible with current stable portage (2.1.4.x), which |
| | uses the _mtime_ field contained in the file when |
| | available. |
| 11986 | Store the _eclasses_ field instead of INHERITED. |
| zmedico | |
| 11988 | include quotes when showing make output |
| SpankMan | |
| 11990 | For emerge --metadata runs, update _eclasses_ metadata to |
| zmedico | insert local eclass paths. |
| 11992 | Make serialize_eclasses() sort eclass names. |
| zmedico | |
| 11994 | When warning about 'missing repo_name', also give the exact |
| zmedico | path where the entry should exist, and explain that it |
| | should be a plain text file containing a unique name of the |
| | first line. This should give the users enough information |
| | to correct the problem without needing to seek help. |
| 11995 | Move the repo_name check/warning into a function. |
| zmedico | |
| 11997 | Bug #245779 - Document the new category subdirectory |
| zmedico | behavior for PKGDIR. |
| 11999 | Bug #245716 - When generating QA notices for 'command not |
| zmedico | found' messages in the build log, exclude messages that are |
| | emitted from configure scripts since those are normal in |
| | some cases. |
| 12001 | Remove --fetchonly --resume time.sleep() call which is an |
| zmedico | artifact from the previous parallel-fetch implementation. |
| 12003 | Bug #247625 - Update PORTAGE_IONICE_COMMAND docs to reflect |
| zmedico | that it is unset by default. |
| 12004 | Remove PORTAGE_IONICE_COMMAND setting since it's commented |
| zmedico | out. |
svn path=/main/branches/prefix/; revision=12037
Fabian Groffen [Sat, 22 Nov 2008 11:29:10 +0000 (11:29 -0000)]
Merged from trunk -r11964:11982
| 11966 | Only show the "--without-mask" suggestion when packages are |
| zmedico | actually masked by package.mask (rather than just keywords). |
| 11968 | Suggest to use the new --include-dev (-d) option in cases |
| zmedico | when some ebuilds have keywords from 'dev' profiles. This |
| | should help avoid confusion about 'dev' profiles no longer |
| | being checked by default. |
| 11970 | Trigger the --include-dev suggestion for any keywords from |
| zmedico | dev profiles, even if those keywords also belong to stable |
| | profiles. |
| 11972 | Add a QA Notice for 'jobserver unavailable' from make in the |
| zmedico | build log. Thanks to Diego 'Flameeyes' Pettenò |
| | <flameeyes@g.o> for the suggestion. |
| 11974 | Fix the 'jobserver unavailable' regex to match gmake. |
| zmedico | |
| 11976 | Add missing -a option for git commits. |
| zmedico | |
| 11978 | Bug #246667 - Add REPOMAN_VCS_LOCAL_OPTS and |
| zmedico | REPOMAN_VCS_GLOBAL_OPTS variables that allow vcs options to |
| | be passed in for commit commands. |
| 11980 | When committing manifests, specify the manifest paths |
| zmedico | instead of using git commit -a, since we may not want to |
| | commit all dirty files in the whole repo. Thanks to Robin |
| | Johnson <robbat2@g.o> for reporting. |
| 11982 | When parsing `git diff` output, filter paths that are not |
| zmedico | descended from the current directory. |
svn path=/main/branches/prefix/; revision=12036
Fabian Groffen [Sat, 22 Nov 2008 11:26:59 +0000 (11:26 -0000)]
Merged from trunk -r11947:11964
| 11948 | Bug #246853 - Redirect all ouput from |
| zmedico | depgraph.display_problems() to stderr. |
| 11949 | Make depgraph.display_problems() send unsatisfied dependency |
| zmedico | ouput to stdout, for parsing by programs such as autounmask. |
| 11951 | Bug #246821 - Avoid TypeError from binarytree.isremote() by |
| zmedico | returning early if self._remotepkgs is None due to |
| | PORTAGE_BINHOST being unset. |
| 11953 | Check the return value from depgraph._add_pkg() when adding |
| zmedico | library consumers inside action_depclean(). |
| 11954 | Inside depgraph._add_pkg(), handle the case where multiple |
| zmedico | different instances of the same version (typically one |
| | installed and another not yet installed) have been pulled |
| | into the graph due to a USE dependency. The "slot collision" |
| | display is not helpful in a case like this, so display it as |
| | an unsatisfied dependency. Thanks to Peter Volkov <pva@g.o> |
| | for reporting. |
| 11956 | Make NewsManager.updateItems() and getUnreadItems() return |
| zmedico | early if PermissionDenied errors are encountered when |
| | attempting to read the skip or unread files. |
| 11958 | Fix logic inside PollScheduler._can_add_job() so that load |
| zmedico | average is properly considered when a single job is running. |
| 11960 | When a "slot conflict" occurs due to USE dependencies, |
| zmedico | display the usual slot conflict output together with the |
| | unsatisfied USE dependency output, since both might be |
| | useful. |
| 11962 | In order to reduce time consumed for dependency checks, skip |
| zmedico | 'dev' profiles by default and add an --include-dev option |
| | which causes them to be checked. Given the current |
| | profiles.desc content, this approximately halves the number |
| | of profiles checked by default and also halves the time |
| | consumed by repoman. Thanks to Donnie Berkholz |
| | <dberkholz@g.o> for the suggestion. |
| 11964 | Add a short -d option for the new --include-dev option. |
| zmedico | Thanks to Joshua Kinard <kumba@g.o> for the suggestion. |
svn path=/main/branches/prefix/; revision=12035
Fabian Groffen [Sat, 15 Nov 2008 17:40:52 +0000 (17:40 -0000)]
define root_len
svn path=/main/branches/prefix/; revision=11947
Fabian Groffen [Sat, 15 Nov 2008 16:29:35 +0000 (16:29 -0000)]
Merged from trunk -r11913:11935
| 11916 | Fix new* and do* ebuild helpers to generate consistent error |
| zmedico | messages for missing files and generate an appropriate QA |
| | Notice when such an error is detected in the build log. |
| | Thanks to Diego 'Flameeyes' Pettenò <flameeyes@g.o> for the |
| | suggestion. |
| 11918 | Bug #216190 - Make dblink.treewalk() bail out rather than |
| zmedico | install a package with file paths containing newlines. |
| 11920 | Bug #243022 - Inside dblink.mergeme(), when merging a |
| zmedico | directory and a symlink is in the way, verify that if points |
| | to a directory before accepting it, otherwise move it out of |
| | the way. |
| 11922 | Bug #236683 - Fix PermissionDenied handling to report the |
| zmedico | exception type. |
| 11924 | Make digestgen() handle PermissionDenied internally by |
| zmedico | returning failure, so callers like repoman don't need |
| | exception handling. |
| 11926 | Bug #236714 - Handle PortagePackageException raised from |
| zmedico | Manifest.create(). |
| 11928 | Bug #173284 - Do not traverse hidden directories such as |
| zmedico | .svn or .git when search for protected files. |
| 11929 | Bug #173284 - Do not traverse hidden directories such as |
| zmedico | .svn or .git when search for protected files. |
| 11931 | Remove stray print statement from previous commit. |
| zmedico | |
| 11933 | Bug #173284 - Update config update counting code in |
| zmedico | chk_updated_cfg_files() so hidden directories are ignored. |
| 11935 | Bug #236207 - Replace some hardcoded colors with color |
| zmedico | codes, and use portage.output.EOutput() where appropriate. |
svn path=/main/branches/prefix/; revision=11946
Fabian Groffen [Sat, 15 Nov 2008 16:25:53 +0000 (16:25 -0000)]
Merged from trunk -r11893:11913
| 11894 | Bug #244485 - Document SRC_URI arrows for output file |
| zmedico | customization. |
| 11896 | Having a leading ./ prefix on file paths can trigger a bug |
| zmedico | in the cvs server when committing files to multiple |
| | directories, so strip the prefix. Thanks to Robin H. Johnson |
| | <robbat2@g.o> for reporting. |
| 11898 | Bug #244485 - Document USE dependencies. |
| zmedico | |
| 11899 | Note that USE dependencies appear on the right hand side of |
| zmedico | SLOT dependencies. |
| 11900 | Add newlines so that first lines of tables display properly |
| zmedico | with man2html. |
| 11901 | Bug #244485 - Document the !!atom blocker syntax. |
| zmedico | |
| 11902 | Use a table to condense the docs for the default_* phase |
| zmedico | functions. |
| 11904 | * git support for repoman |
| zmedico | |
| 11907 | Add a --changelog-rev option that truncates the ChangeLog at |
| zmedico | a specific revision. Also, add -i to the svn2cl options so |
| | that the actual svn revision numbers are included in the |
| | log. (trunk r11889) Use svn2cl --reparagraph option for |
| | better ChangeLog formatting. (trunk r11906) |
| 11909 | In dyn_package(), use the 'assert' macro (from |
| zmedico | isolated-functions.sh) die if PIPESTATUS array contains a |
| | non-zero exist status. |
| 11911 | Exempt live ebuilds from KEYWORDS.missing and |
| zmedico | KEYWORDS.dropped warnings. Thanks to Jorge Manuel B. S. |
| | Vicetto <jmbsvicetto@g.o> for the suggestion. |
| 11913 | Make the EbuildQuote check filter out matches that appear to |
| zmedico | be an argument to a message command. For example: false || |
| | ewarn "foo $WORKDIR/bar baz" Thanks to Diego 'Flameeyes' |
| | Pettenò <flameeyes@g.o> for reporting this issue (currently |
| | triggered by ruby-prof-0.7.0.ebuild). |
svn path=/main/branches/prefix/; revision=11945
Fabian Groffen [Sat, 15 Nov 2008 16:24:03 +0000 (16:24 -0000)]
Merged from trunk -r11860:11867
| 11861 | Bug #246451 - Inside SecuritySet._reduce(), use |
| zmedico | portdbapi.xmatch("match-all") in order do be consistent with |
| | portage.glsa.getMinUpgrade() which also uses match-all. |
| 11862 | Use a frozenset to optimize skiplist containment checks |
| zmedico | inside NewsManager.updateItems(). |
| 11863 | Instead of raising a TypeError from the NewsItem |
| zmedico | constructor, check the path inside NewsManager.updateItems() |
| | before the NewsItem constructor is called. |
| 11864 | Inside NewsManager.updateItems(), use a mutable set for |
| zmedico | skiplist and sort the contents when writing the file. |
| 11865 | Sort the return value from cpv_all() inside |
| zmedico | vardbapi._counter_hash() instead of sorting them in side |
| | cpv_all(). Thanks to Brian Harring for the suggestion. |
| 11866 | * Add NewsItem.isValid() and DisplayRestriction.isValid() |
| zmedico | methods and use use them to check validity inside |
| | NewsManager.updateItems(). * Make |
| | DisplayInstalledRestriction.isValid() check validity of the |
| | atom. |
| 11867 | Use a simpler approach instead of implementing |
| zmedico | NewsItem.__getattr__(). |
Merged from trunk -r11867:11893
| 11868 | Always return early from NewsManager.updateItems() if |
| zmedico | self.unread_path can't be created. |
| 11869 | Return early from NewsManager.updateItems() if the news path |
| zmedico | listdir call fails. |
| 11870 | Misc fixes and cleanups in NewsManager. |
| zmedico | |
| 11871 | Add quote from GLEP 42 about permission bits. |
| zmedico | |
| 11872 | Use grabfile() instead of grablines(), to ignore empty |
| zmedico | lines. |
| 11873 | Use apply_secpass_permissions() to avoid |
| zmedico | OperationNotPermitted errors when not allowed to chown files |
| | to root uid. |
| 11890 | Bug #244485 - Document the doman enhancement from bug |
| zmedico | #222439. |
| 11891 | Bug #244485 - Document src_prepare() and src_configure() |
| zmedico | phase functions. |
| 11892 | Bug #244485 - Document the default phase function helpers. |
| zmedico | |
| 11893 | Rename the "FUNCTIONS" section to "PHASE FUNCTIONS". |
| zmedico | |
svn path=/main/branches/prefix/; revision=11944
Fabian Groffen [Sat, 15 Nov 2008 16:20:49 +0000 (16:20 -0000)]
Merged from trunk -r11845:11860
| 11846 | Inside depgraph.loadResumeCommand(), initialize |
| zmedico | self._scheduler_graph when in --nodeps mode in order to |
| | avoid an AttributeError later when self.schedulerGraph() is |
| | called. |
| 11847 | When in --nodeps mode, make Scheduler._set_digraph() discard |
| zmedico | the digraph and make Scheduler._choose_pkg() always return |
| | the task at the front of the queue. |
| 11848 | Fix logic from previous commit in Scheduler._choose_pkg() to |
| zmedico | ensure that the --nodeps code is only triggered when --jobs |
| | > 1. |
| 11849 | Add git support. Thanks to Daniel Robbins for the initial |
| zmedico | patch. |
| 11850 | Fix pretend output to show git -a option when committing |
| zmedico | signed manifest. |
| 11851 | Update hardcoded "cvs" error messages to show the correct |
| zmedico | vcs value. |
| 11852 | Inside have_profile_dir(), check for existence of |
| zmedico | profiles.desc since that makes a little more sense thatn |
| | checking for package.mask. |
| 11853 | Make FindPortdir() return (None, None, None) on failure, |
| zmedico | instead of raising a potentially ambiguous ValueError. |
| 11854 | Derive the changelog_path variable from the new |
| zmedico | checkdir_relative variable. |
| 11855 | Make FindPortdir() fall back to have_profile_dir() checks if |
| zmedico | it can't match the current location with anything from |
| | PORTDIR_OVERLAY. Assume that an overlay will contain at |
| | least a "repo_name" file while a master repo (portdir) will |
| | contain at least a "profiles.desc" file. |
| 11856 | Simplify code for cloning config instances inside |
| zmedico | Scheduler.merge(). |
| 11858 | Allow --keep-going to continue in some cases when a runtime |
| zmedico | dependency has failed to build or install. This involves |
| | pruning off the parts of the graph containing installed |
| | packages with unsatisfied dependencies. |
| 11859 | Make post_emerge() exit early if it detects that the vdb |
| zmedico | state hasn't changed. This works by comparing a hash of the |
| | COUNTER values for all packages in the vdb. |
svn path=/main/branches/prefix/; revision=11943
Fabian Groffen [Sat, 15 Nov 2008 16:18:49 +0000 (16:18 -0000)]
merged r11843 into LinkageMapMachO
svn path=/main/branches/prefix/; revision=11942
Fabian Groffen [Sat, 15 Nov 2008 16:17:24 +0000 (16:17 -0000)]
Merged from trunk -r11841:11845
| 11842 | * Use noiselevel=-1 for preserve-libs ">>> needed" and "<<< |
| zmedico | !needed" messages so that they're show even without |
| | --verbose mode. * Sort files for the ">>> needed" display. |
| 11843 | In the LinkageMap.findConsumers() docstring, add a note |
| zmedico | about incompatibility with symlinks created by |
| | binutils-config. |
| 11844 | Revert r11839 since it's not necessarily desired to invert |
| zmedico | all uninstall edges. TODO: Invert only the specific edges |
| | that the depgraph has decided are necessary and allowed to |
| | be inverted. |
| 11845 | Fix --jobs parallel scheduling to ensure that temporary |
| zmedico | simultaneous installation of conflicting packages is avoided |
| | when appropriate (especially for !!atom blockers), but |
| | allowed in specific cases that require it. This is |
| | accomplished by reversing specific uninstall edges in the |
| | digraph, while possibly leaving some edges in there original |
| | state. |
svn path=/main/branches/prefix/; revision=11941
Fabian Groffen [Sat, 15 Nov 2008 16:15:00 +0000 (16:15 -0000)]
Merged from trunk -r11833:11841
| 11834 | Update docstring for dblink._find_libs_to_preserve(). |
| zmedico | |
| 11835 | Handle a corner case inside |
| zmedico | dblink._add_preserve_libs_to_contents() in which a path to |
| | be preserved doesn't exist in the contents of the installed |
| | instance. |
| 11836 | When adding parent directories to contents inside |
| zmedico | dblink._add_preserve_libs_to_contents(), account for the |
| | trailing slash on $ROOT in the while loop. |
| 11837 | Add PROPERTIES=interactive support in depgraph.display() and |
| zmedico | the PackageCounters class. |
| 11838 | Move initialization of Scheduler._background from the |
| zmedico | constructor to the merge() method so that a potential |
| | InvalidDependString exception can be handled there, causing |
| | merge() to return unsuccessfully. This avoids having to |
| | raise an exception from the constructor. |
| 11839 | Inside Scheduler._reverse_uninstall_edges(), iover all nodes |
| zmedico | rather than just the merge list, because some uninstall |
| | nodes may not be in the merge list since they will be |
| | performed as part of an upgrade within a slot. This solves a |
| | problem with Scheduler._choose_pkg() not parallelizing in |
| | some cases when it should, due to an uninstall node not |
| | having it's edge reversed like it's supposed to. |
| 11840 | Make show_invalid_depstring_notice() send output to stderr |
| zmedico | via writemsg_level(). |
| 11841 | Remove unused formatter code in |
| zmedico | show_invalid_depstring_notice(). |
svn path=/main/branches/prefix/; revision=11940
Fabian Groffen [Sat, 15 Nov 2008 16:13:09 +0000 (16:13 -0000)]
merge changes from previous commit from LinkageMap into LinkageMapMachO
svn path=/main/branches/prefix/; revision=11939
Fabian Groffen [Sat, 15 Nov 2008 15:23:03 +0000 (15:23 -0000)]
Merged from trunk -r11816:11833
| 11817 | Inside LinkageMap._libs, use a SlotDict to store consumers |
| zmedico | and providers, to use less memory than a normal dict. |
| 11818 | Swap the locations of the arch and soname keys inside |
| zmedico | LinkageMap._libs in order to conserve memory. This new |
| | branching layout uses fewer dict instances since the number |
| | of sonames is much larger than the number of archs. |
| 11819 | Combine redundant arch_map code inside LinkageMap.rebuild(). |
| zmedico | |
| 11820 | When using the `read` builtin to split newlines in e* |
| zmedico | function arguments, use $REPLY in order to ensure that |
| | whitespace in each line is correctly preserved. Thanks to |
| | Joe Peterson <lavajoe@g.o> for reporting. |
| 11821 | Fix LinkageMap.rebuild() so that the data from include_file |
| zmedico | overrides the data from any previously installed files. This |
| | prevent possible corruption of the data since only one set |
| | of data can be correct for a given file. |
| 11822 | When calling scanelf inside LinkageMap.rebuild(), join paths |
| zmedico | with $ROOT when generating the arguments and then strip |
| | $ROOT from the paths in the output. |
| 11823 | Improve the error message that's generated in |
| zmedico | LinkageMap.rebuild() for corrupt NEEDED.ELF.2 entries. |
| 11824 | Replace NEEDED.ELF.2 strings with references to |
| zmedico | LinkageMap._needed_aux_key. |
| 11825 | Handle a potential OSError that occurs if the scanelf binary |
| zmedico | is missing when LinkageMap.rebuild() is called. |
| 11826 | In LinkageMap.rebuild(), immediately raise a CommandNotFound |
| zmedico | exception if scanelf is missing since otherwise it will lead |
| | to a KeyError later on from findConsumers or findProviders. |
| | This will allow the caller to handle the CommandNotFound |
| | exception if necessary, and skip any findConsumers or |
| | findProviders since they won't be able to return valid |
| | results. |
| 11827 | Handle CommandNotFound exceptions if the scanelf binary |
| zmedico | happens to be missing, and disable preserve-libs code in |
| | that case. |
| 11828 | With python-2.6, importing the Crypto.Hash.MD5 and |
| zmedico | Crypto.Hash.SHA modules from pycrypto triggers warnings |
| | since those modules are implemented using the deprecated md5 |
| | and sha modules from python's stdlib. So, in order to avoid |
| | the warning and the inferior hash implementations that come |
| | with them, never use these particular modules from pycrypto. |
| | Instead, use hashlib or directly use stdlib's md5 and sha |
| | modules if necessary. Thanks to Markus Peloquin for |
| | reporting. |
| 11829 | Fix $ROOT handlink inside display_preserved_libs(). |
| zmedico | |
| 11830 | Inside LinkageMap, use self._obj_key() whenever possible. |
| zmedico | |
| 11831 | Bug #245362 - Rewrite preserve-libs preservation code so |
| zmedico | that it always relies on inode comparisons rather than |
| | string comparisons. Instead of injecting libraries into $D |
| | before the files are merged, the preservation code now |
| | executes after the files are merged but before the old |
| | version is unmerged. After determining which libs to |
| | preserve, the CONTENTS are updated to include those libs. |
| | The PreservedLibsRegistry.register() call is now done just |
| | after the temporary vdb entry has been moved into place, |
| | guaranteeing that a valid vdb entry is in place so that the |
| | unregistration code from bug #210501 is no longer needed. |
| 11832 | Bug #243030 - In PreservedLibraryConsumerSet.load(), avoid |
| zmedico | rebuilding packages just because they contain preserved libs |
| | that happen to be consumers of other preserved libs. |
| 11833 | Inside vardbapi.removeFromContents(), automatically clear |
| zmedico | the contents cache of the dblink instance in case an |
| | existing one was passed in. |
svn path=/main/branches/prefix/; revision=11938
Fabian Groffen [Sat, 15 Nov 2008 15:17:23 +0000 (15:17 -0000)]
Merged from trunk -r11811:11816
| 11812 | Override Atom.__setattr__() to make Atom instances |
| zmedico | immutable. Thanks to Brian Harring for the suggestion. |
| 11813 | In Atom.__setattr__(), include inputs in case it helps for |
| zmedico | debugging with derived classes. Thanks to Brian Harring for |
| | the suggestion. |
| 11814 | Bug #245661 - Never enable --complete-graph automatically |
| zmedico | since it's confusing for users. |
| 11815 | Remove the special package.keywords mask warning from bug |
| zmedico | #223447 since --depclean now uses the depgraph class and |
| | therefore should be more consistent with the update |
| | algorithm. |
| 11816 | Bug #245932 - Pass use_mask and use_force parameters into |
| zmedico | recursive _expand_new_virtuals() calls, fixing a TypeError |
| | which is triggered inside |
| | portage.dep._use_dep._eval_qa_conditionals(). |
svn path=/main/branches/prefix/; revision=11937
Fabian Groffen [Tue, 11 Nov 2008 19:08:19 +0000 (19:08 -0000)]
don't use curly braces, I don't trust them
svn path=/main/branches/prefix/; revision=11857
Fabian Groffen [Wed, 5 Nov 2008 18:29:48 +0000 (18:29 -0000)]
Make some changes to make the LinkageMapMachO more compatible (codewise) to LinkageMap. It isn't necessary, since no patch lookups are done, as we have absolute paths as keys.
svn path=/main/branches/prefix/; revision=11811
Fabian Groffen [Wed, 5 Nov 2008 18:08:52 +0000 (18:08 -0000)]
Merged from trunk -r11799:11809
| 11800 | Remove locking from EbuildFetchPretend since it uses a |
| zmedico | private temp directory now (since bug #245231). |
| 11801 | Remove duplicate code inside EbuildFetchPretend._execute(). |
| zmedico | |
| 11802 | Import shutil globally. |
| zmedico | |
| 11803 | Make metadata.missing and metadata.bad fatal by removing |
| zmedico | them from the qawarnings set. Thanks to Robin H. Johnson |
| | <robbat2@g.o> for the suggestion. |
| 11804 | Bug #245356 - Filter POSIXLY_CORRECT from the ebuild |
| zmedico | environment since it breaks stuff. |
| 11805 | Bug #245358 - For unsatisfied dependencies, display the |
| zmedico | parent nodes and the argument that pulled them in. |
| 11806 | Bug #245362 - Use tuples of (device, inode) for all path |
| zmedico | comparisons inside LinkageMap, so that they work regardless |
| | of path differences due to symlinked directories. TODO: Fix |
| | other preserve-libs code, such as dblink._preserve_libs(), |
| | to use this approach for path comparisons. |
| 11807 | Free some memory by clearing the LinkageMap cache when it's |
| zmedico | not needed. |
| 11808 | Synchronize portage update/restart logic in dblink.merge() |
| zmedico | and depgraph.display() so it's consistent with |
| | Scheduler._is_restart_necessary(). Thanks to Jeremy Olexa |
| | <darkside@g.o> for reporting. |
| 11809 | Fix broken reference to self inside unmerge(). |
| zmedico | |
svn path=/main/branches/prefix/; revision=11810
Fabian Groffen [Sun, 2 Nov 2008 10:16:39 +0000 (10:16 -0000)]
uhm... we need ostype
svn path=/main/branches/prefix/; revision=11799
Fabian Groffen [Sun, 2 Nov 2008 10:02:21 +0000 (10:02 -0000)]
Merged from trunk -r11795:11796
| 11796 | Bug #245231 - Make EbuildFetchPretend use a private temp |
| zmedico | directory in order to avoid locking the main one. |
svn path=/main/branches/prefix/; revision=11798
Fabian Groffen [Sun, 2 Nov 2008 09:47:42 +0000 (09:47 -0000)]
Perhaps it is a better idea to have our own implementation of _LibGraphNode in LinkageMapMachO...
svn path=/main/branches/prefix/; revision=11797
Fabian Groffen [Sun, 2 Nov 2008 08:01:32 +0000 (08:01 -0000)]
Merged from trunk -r11785:11791
| 11786 | Bug #239015 - Disable unmerge operations for |
| zmedico | EverythingSet/@installed. |
| 11787 | In Scheduler._calc_resume_list(), use self.pkgsettings |
| zmedico | instead of the the temportary depgraph's. |
| 11788 | TODO: In case some elf files collide with blocked packages, |
| zmedico | ensure that NEEDED data from include_file overrides the |
| | stale NEEDED data from the colliding files in the blocked |
| | packages. |
| 11789 | In _validate_deps(), show the ebuild version to clarify |
| zmedico | which ebuild the errors belong to. |
| 11790 | In config.setcpv(), ensure that A and AA aren't in the env |
| zmedico | dict. |
| 11791 | In SetConfig.getSetAtoms(), access self.psets directly in |
| zmedico | order to avoid making a copy and also to avoid potential |
| | swallowing of an unexpected KeyError. |
svn path=/main/branches/prefix/; revision=11795
Fabian Groffen [Sun, 2 Nov 2008 07:58:32 +0000 (07:58 -0000)]
Apply r11777 to LinkageMapMachO
svn path=/main/branches/prefix/; revision=11794
Fabian Groffen [Sun, 2 Nov 2008 07:55:50 +0000 (07:55 -0000)]
Merged from trunk -r11776:11784
| 11777 | Rename "object" variable to avoid name collision with the |
| zmedico | builtin class. |
| 11778 | Before returning from PreservedLibsRegistry.store(), update |
| zmedico | self._data_orig. |
| 11779 | Explicitly load the preserved libs registry after obtaining |
| zmedico | a lock for merge or unmerge, in case the registry has been |
| | changed by a parallel emerge instance. |
| 11780 | Also call PreservedLibsRegistry.pruneNonExisting() after |
| zmedico | obtaining a lock and loading it for merge or unmerge. |
| 11781 | Remove unnecessary handler for plain "Exception" from |
| zmedico | lstat() call in dblink.mergeme(). |
| 11782 | * In fetch(), ensure that pkg_nofetch is never called more |
| zmedico | than once. * In _validate_deps(), revert back to using |
| | aux_get since the config instance does not cache SRC_URI. |
| 11783 | Remove broken pickle_write() since it can't possibly be |
| zmedico | used. |
| 11784 | When echoing the emake command, redirect to stderr since |
| zmedico | otherwise it breaks the gcc ebuild because of the way that |
| | the get_make_var() function from toolchain.eclass is used. |
svn path=/main/branches/prefix/; revision=11793
Fabian Groffen [Sat, 1 Nov 2008 16:01:40 +0000 (16:01 -0000)]
Merged from trunk -r11755:11768
| 11756 | Bug #244975 - Don't allow the user to make portage unmerge |
| zmedico | itself since there's never any valid reason to do so. |
| 11758 | Use portage.const.PORTAGE_PACKAGE_ATOM where appropriate. |
| zmedico | |
| 11759 | Pass a Package instance into the config.setcpv() call. |
| zmedico | |
| 11760 | Fix broken stuff to avoid tracebacks when running in commit |
| zmedico | mode with --pretend and no vcs. |
| 11761 | Remove unused conditional_disabled and conditional_enabled |
| zmedico | attributes from _use_dep.__slots__. |
| 11762 | Bug #244947 - Add repoman support for checking masked and |
| zmedico | forced flags when verifying USE deps. Thanks to Brian |
| | Harring for reporting. |
| 11763 | Revert previous commit since it doesn't properly calculate |
| zmedico | masked and forced flags for the package being matched (it |
| | erroneously uses the masked and forced flags from the parent |
| | package). |
| 11764 | Bug #236609 - Fix columns calculation for TERM="dumb". |
| zmedico | Thanks to Ulrich Müller <ulm@g.o> for the patch. |
| 11765 | In dblink._collision_protect(), remove redundant |
| zmedico | self.isowner() calls since self hasn't yet been merged and |
| | therefore has no CONTENTS file for ownership checks. Also, |
| | remove redundant isprotected() calls. |
| 11766 | Bug #243178 - Handle file collisions with preserved libs by |
| zmedico | allowing the current package to assume ownership and |
| | unregistering the preserved libraries. |
| 11767 | Eliminate duplicate code by calling equivalent |
| zmedico | dblink._clear_contents_cache(). |
| 11768 | Bug #244947 - Add basic repoman support for checking masked |
| zmedico | and forced flags when verifying USE deps. TODO: Add repoman |
| | support in dep_check() for evaluation of conditional USE |
| | deps based on forced/masked flags. masked flags, so that |
| | repoman can also |
Merged from trunk -r11768:11776
| 11769 | Bug #244947 - Add repoman support for checking masked and |
| zmedico | forced flags on conditional USE deps. |
| 11770 | Bug #244792 - Remove confcache support. |
| zmedico | |
| 11771 | Bug #241906 - Handle InvalidAtom exception raised from |
| zmedico | vardbapi.match(). |
| 11772 | Bug #240295 - When emake is called, echo the make command |
| zmedico | similar to the way that econf echoes the configure command. |
| 11773 | Filter PORTAGE_VERBOSE in save_ebuild_env(). |
| zmedico | |
| 11774 | Remove unused imports. |
| zmedico | |
| 11775 | Define __all__ and remove unused import. |
| zmedico | |
| 11776 | Define __all__ and remove unused imports. |
| zmedico | |
svn path=/main/branches/prefix/; revision=11785
Fabian Groffen [Thu, 30 Oct 2008 21:16:03 +0000 (21:16 -0000)]
recheck what changed in the repository also when nothing was added, because manifest regeneration might change the Manifest, this fixes bug #229033
svn path=/main/branches/prefix/; revision=11755
Fabian Groffen [Thu, 30 Oct 2008 21:13:23 +0000 (21:13 -0000)]
Merged from trunk -r11745:11753
| 11746 | Bug #225429 - In dblink.unmerge(), eliminate consumers |
| zmedico | having providers with the same soname as an installed |
| | library that is not preserved. This eliminates libraries |
| | that are erroneously preserved due to a move from one |
| | directory to another. |
| 11747 | In dblink.unmerge(), update the CONTENTS entries when |
| zmedico | preserved libs are removed. |
| 11748 | Bug # 225429 - Try to remove unneeded preserved libs just |
| zmedico | before returning from dblink.treewalk(), after the library |
| | path has been updated. This is intended to remove unneeded |
| | preserved libs after a gcc upgrade. TODO: Figure out why |
| | libgomp.so.1 still isn't properly removed. |
| 11749 | Bug #225429 - Inside LinkageMap.rebuild(), update |
| zmedico | self._defpath since it can change during a gcc upgrade. |
| 11751 | define myunadded such that repoman doesn't crash when being |
| zmedico | run in a non-{cvs,svn} dir (branches/prefix r11750) |
| 11752 | Avoid unnecessary aux_get calls inside Scheduler._pkg() by |
| zmedico | getting the existing Package instance from the digraph. |
| 11753 | Make sure mychanged and mynew are always defined even if |
| zmedico | there is no vcs because commit mode is allowed without a vcs |
| | in pretend mode. |
svn path=/main/branches/prefix/; revision=11754
Fabian Groffen [Thu, 30 Oct 2008 19:51:48 +0000 (19:51 -0000)]
define myunadded such that repoman doesn't crash when being run in a non-{cvs,svn} dir
svn path=/main/branches/prefix/; revision=11750
Fabian Groffen [Wed, 29 Oct 2008 20:15:28 +0000 (20:15 -0000)]
Apply LinkageMap changes to LinkageMapMachO, make sure we call rebuild correctly
svn path=/main/branches/prefix/; revision=11745
Fabian Groffen [Wed, 29 Oct 2008 20:02:41 +0000 (20:02 -0000)]
Merged from trunk -r11736:11743
| 11737 | Fix graph.get() so that it works as intended, returning the |
| zmedico | node corresponding to the given key. |
| 11738 | Remove manifest1 digest-* autoadd code. Thanks to grobian. |
| zmedico | |
| 11739 | Update the auto-add message to say "Manifest" instead of |
| zmedico | "digests". Thanks to grobian. |
| 11740 | Bug #238957 - When removing unneeded preserved libs inside |
| zmedico | dblink.unmerge(), use a digraph to properly track consumer |
| | relationships between preserved libs. This fixes cases where |
| | preserved libs failed to be removed due to being consumed by |
| | other preserved libs. |
| 11741 | Fix $ROOT handling inside LinkageMap.findConsumers(). |
| zmedico | |
| 11742 | Fix interaction between LinkageMap.rebuild() and the package |
| zmedico | replacement process in order to avoid problems with stale or |
| | unaccounted NEEDED. This solves a LinkageMap corruption |
| | issue which caused findConsumers to return false positive |
| | inside dblink.unmerge(). |
| 11743 | Make config.setcpv() store the ebuild metadata inside |
| zmedico | self.configdict["pkg"], and reuse this metadata inside |
| | doebuild() in order to avoid redundant portdbapi.aux_get() |
| | calls. |
svn path=/main/branches/prefix/; revision=11744
Fabian Groffen [Tue, 28 Oct 2008 19:09:53 +0000 (19:09 -0000)]
Merged from trunk -r11724:11733
| 11725 | When creating the temporary $DISTDIR, do not try to set the |
| zmedico | uid since it will fail when not running as root. |
| 11726 | Enable bashrc even when $EBUILD_PHASE is unset, so it's |
| zmedico | possible to override things like INSTALL_MASK. |
| 11727 | In fetch(), avoid the "Adjusting permissions recursively" |
| zmedico | message in cases when the directory has just been created |
| | and therefore it must be empty. |
| 11728 | Return early from fetch() if no uris are given. |
| zmedico | |
| 11729 | Pass $ROOT into portage.util.getlibpaths(). |
| zmedico | |
| 11730 | Pass $ROOT into the LinkageMap._ObjectKey constructor since |
| zmedico | it's needed for os.stat() and realpath() calls. |
| 11731 | Fix incorrect $ROOT handling inside dblink._preserve_libs(). |
| zmedico | |
| 11732 | Make SetConfig.getSetAtoms() raise a PackageSetNotFound |
| zmedico | exception when necessary and add handling code in emerge. |
| | This solves an unhandled KeyError that was raise when a |
| | nested set did not exist. Thanks to ABCD for reporting. |
| 11733 | Fix some incorrect $ROOT handling inside LinkageMap. |
| zmedico | |
svn path=/main/branches/prefix/; revision=11736
Fabian Groffen [Tue, 28 Oct 2008 18:51:42 +0000 (18:51 -0000)]
Merged from trunk -r11713:11724
| 11714 | Split dep validation out of doebuild() and skip it when |
| zmedico | called by emerge since there's no need to do this every time |
| | emerge executes a phase. |
| 11715 | Bug #233296 - Add minimal PROPERTIES=interactive support by |
| zmedico | simply forcing all package output to stdio whenever the |
| | merge list contains one or more interactive packages. |
| 11716 | Document PROPERTIES=interactive. |
| zmedico | |
| 11717 | Add a PROPERTIES.syntax check. |
| zmedico | |
| 11718 | Fix grammar. |
| zmedico | |
| 11719 | Bug #243224 - Add an exemption to the inherit.autotools |
| zmedico | check for ebuilds that inherit git.eclass since the |
| | GIT_BOOTSTRAP variable may be used to call one of autotools |
| | functions. |
| 11720 | Add "bzr" to the lists of live eclasses. |
| zmedico | |
| 11721 | Add "bzr" to the lists of live eclasses. |
| zmedico | |
| 11722 | Add "subversion" to InheritAutotools._exempt_eclasses. |
| zmedico | Thanks to Arfrever. |
| 11723 | When populating the fake $DISTDIR inside doebuild(), reuse |
| zmedico | existing symlinks when possible, instead of recreating the |
| | whole directory from scratch. |
| 11724 | Fix preserve-libs code inside dblink.unmerge() so that it |
| zmedico | will join paths correctly when ROOT != /. |
svn path=/main/branches/prefix/; revision=11735
Fabian Groffen [Tue, 28 Oct 2008 18:47:54 +0000 (18:47 -0000)]
Merged from trunk -r11701:11713
| 11702 | Remove the "found_available_arg" variable from |
| zmedico | depgraph._select_pkg() and use the "matched_packages" |
| | variable instead. This solve a problem where the |
| | "found_available_arg" flag is unreliable due to the slot |
| | filtering behavior of depgraph._iter_atoms_for_pkg(). For |
| | example, a higher version in a different slot than the |
| | available ebuild might be masked or unavailable, and |
| | depgraph._iter_atoms_for_pkg() will not identify the |
| | available ebuild as a match due to this installed package |
| | (which is not available for reinstall). |
| 11703 | Simplify logic from the previous commit. |
| zmedico | |
| 11704 | Revert previous 2 commits since they broke "selective" |
| zmedico | behavior. |
| 11705 | Handle the case that was intended to be fixed by r11702 |
| zmedico | (which got reverted). |
| 11706 | Prefer thirdpartymirrors over normal mirrors in cases when |
| zmedico | the file does not yet exist on the normal mirrors. Thanks to |
| | Maurice van der Pot <griffon26@g.o> for reporting. |
| 11707 | Remove redundant duplicate uri elimination code. It's |
| zmedico | already handled in the fetch loop. |
| 11708 | Add PORTAGE_QUIET to the environment whitelist and filter it |
| zmedico | from the saved ebuild environment. |
| 11709 | Bug #186842 - Suppress file merge display, as previously |
| zmedico | done in --quiet mode, whenever --verbose is not enabled. |
| | Also, export PORTAGE_VERBOSE to the ebuild environment and |
| | use it to control tar verbosity when creating binary |
| | packages. |
| 11710 | Use normal return statements instead of calling sys.exit() |
| zmedico | inside dblink.mergeme(). |
| 11711 | Remove needlessly complex error handling code from |
| zmedico | vardbapi.cpv_counter(). |
| 11712 | Remove unused imports found by pyflakes. |
| zmedico | |
| 11713 | Validate PROPERTIES inside doebuild(). |
| zmedico | |
svn path=/main/branches/prefix/; revision=11734
Fabian Groffen [Sat, 18 Oct 2008 20:17:04 +0000 (20:17 -0000)]
install make.conf.example and make.globals in usr/share/portage/config/
svn path=/main/branches/prefix/; revision=11701
Fabian Groffen [Sat, 18 Oct 2008 19:55:47 +0000 (19:55 -0000)]
Merged from trunk -r11694:11699
| 11695 | Bug #242304 - When a zero-byte distfile is detected inside |
| zmedico | fetch(), discard the digests and attempt to fetch the file |
| | if possible. This code is triggered via digestgen() when |
| | appropriate, so it fixes all digestgen() callers, including |
| | repoman. |
| 11696 | In fetch(), don't spawn pkg_nofetch unless PORTAGE_BUILDDIR |
| zmedico | exists since it will die anyway due to the code for bug |
| | #239560 that's in ebuild.sh. |
| 11697 | In fetch(), make sure all references to digests for |
| zmedico | zero-byte distfile are always discarded. |
| 11698 | Remove support for FEATURES=gpg since it's already disabled |
| zmedico | and broken anyway. Thanks to DJ Anderson for the suggestion. |
| 11699 | Remove the unused portage.gpg module and |
| zmedico | portage_gpg_update.sh script. |
svn path=/main/branches/prefix/; revision=11700
Fabian Groffen [Wed, 15 Oct 2008 20:33:21 +0000 (20:33 -0000)]
Merged from trunk -r11675:11692
| 11676 | Bug #241204 - Fix dbapi.invalidentry() calls inside |
| zmedico | vardbapi.cpv_all() to correctly join the path via |
| | self.getpath(). |
| 11677 | When warning about package categories that haven't been |
| zmedico | configured via /etc/portage/categories, join the path with |
| | PORTAGE_CONFIGROOT. Thanks to Ned Ludd <solar@g.o> for |
| | reporting. |
| 11678 | In EbuildFetcher._start(), in order to ensure that a new log |
| zmedico | is created when appropriate, clean up PORTAGE_BUILDDIR if |
| | appropriate. |
| 11679 | Make the Scheduler class treat failed fetches the same as |
| zmedico | other failed packages, and don't bail out due to a failure |
| | when in --fetchonly mode. This fixes an issue with |
| | --fetchonly bailing out instead of continuing to fetch. |
| 11680 | Buge #241100 - Make EbuildFetcher use a pty when |
| zmedico | appropriate, so that fetcher progress bars, like wget has, |
| | will work properly. |
| 11681 | Remove the prefetch logic in EbuildFetcher._pipe() since |
| zmedico | prefetchers are always in the background anyway. |
| 11682 | Now that only prefetch (parallel-fetch) output goes to the |
| zmedico | global fetch log, update code to remove inappropriate |
| | references to this log. |
| 11683 | Inside fetch(), don't call pkg_nofetch when in |
| zmedico | parallel-fetch mode since it will get call again later |
| | anyway. |
| 11684 | Add an explicit note about bug #239560 in the relevant code. |
| zmedico | |
| 11685 | Bug #241118 - Re-enable pkg_nofetch for emerge --pretend |
| zmedico | --fetch, but direct output to stderr. This requires |
| | PORTAGE_BUILDDIR locking for bug #239560 and also for elog |
| | message storage. |
| 11686 | Bug #234301 - When fetch fails, include the path of the log |
| zmedico | file in the eerror message that's generated. This way it's |
| | easy for the user to find the output from the fetcher or |
| | from the pkg_nofetch phase. |
| 11687 | Don't return from fetch() due to fetch restriction when in |
| zmedico | "listonly" mode. |
| 11688 | Make fetch() fetch as many files as possible, even if some |
| zmedico | fail, when in fetchonly mode. |
| 11689 | Make sure the pkg_nofetch phase is only called once when in |
| zmedico | fetchonly mode. |
| 11690 | When emerge --keep-going bails due to missing dependencies, |
| zmedico | show the error message after the mod_echo output since |
| | otherwise the mod_echo output can sweep the error message |
| | out of view. Thanks to Donnie Berkholz <dberkholz@g.o> for |
| | reporting. |
| 11691 | Bug #241366 - Only suggest to run `emaint --check world` |
| zmedico | when the atom is a direct member of the world set (rather |
| | than from a nested set). |
| 11692 | Bug #229033 - When a Manifest is added automatically by |
| zmedico | repoman, it's in the "mynew" list, so move manifest paths |
| | from that list to the "mymanifests" list when necessary. |
svn path=/main/branches/prefix/; revision=11694
Fabian Groffen [Wed, 15 Oct 2008 19:39:42 +0000 (19:39 -0000)]
Make note that Prefix uses rsync mirrors too. Since we now got an American mirror (tinderbox.dev.g.o) we split our mirrors up in two continents in the documentation.
svn path=/main/branches/prefix/; revision=11693
Fabian Groffen [Sat, 11 Oct 2008 15:49:30 +0000 (15:49 -0000)]
Merged from trunk -r11654:11673
| 11655 | Before returning config instances from |
| zmedico | Scheduler._allocate_config(), call the config.reset() |
| | method to make sure all settings from the previous package |
| | get flushed out (such as PORTAGE_LOG_FILE). This fixes a |
| | case where PORTAGE_LOG_FILE leaked from the previous |
| | package to the clean phase of the next one, resulting in an |
| | IOError due to the path being invalid and the parent |
| | directory being nonexistent. |
| 11656 | Since EbuildBuild no longer directs it's EbuildFetcher |
| zmedico | instance's output to the global fetch log, there's no need |
| | to schedule it on the fetch queue. |
| 11657 | Use separate temp directories in order to avoid potential |
| zmedico | name collisions. |
| 11658 | In EbuildBuild._fetch_exit(), clean up the fetch log if |
| zmedico | fetch was successful. |
| 11659 | Fix apparent breakage from r11593 (slot dep support): * |
| zmedico | Handle KeyError from element.getAttribute() in makeAtom() |
| | and makeVersion(). * Avoid 'sre_constants.error: unmatched |
| | group' exceptions in revisionMatch() when the atom does not |
| | have a slot. |
| 11660 | Don't show the repo display when the merge list is empty. |
| zmedico | |
| 11661 | In EbuildFetcher._set_returncode(), don't clean up |
| zmedico | PORTAGE_BUILDDIR if keepwork or keeptemp are in FEATURES. |
| 11664 | Bug #240684 - Fix _ebuild_arg_to_phase() to handle the |
| zmedico | src_prepare phase so that the default() function is |
| | properly created. |
| 11665 | Fix code from previous commit so it properly checks $eapi |
| zmedico | to verify that src_prepare is really a supported phase |
| | function. |
| 11666 | Remove redundant os.close(master_fd) call inside |
| zmedico | SpawnProcess._start() since that file discriptor is |
| | referenced by a file object which already has an |
| | appropriate close() call. This fixes an 'IOError: [Errno 9] |
| | Bad file descriptor' exception which was raised when |
| | attempting to close the file object. |
| 11667 | At the end of dyn_clean(), also remove the $CATEGORY |
| zmedico | directory if possible. |
| 11669 | Grab make.globals from GLOBAL_CONFIG_PATH if available and |
| zmedico | fall back to the legacy location if necessary. |
| 11670 | Create a new AmbiguousPackageName exception to raise from |
| zmedico | portage.cpv_expand(). It inherits from ValueError, for |
| | backward compatibility with calling code that already |
| | handles ValueError. |
| 11671 | Bug #241132 - Handle AmbiguousPackageName exceptions for |
| zmedico | atoms passed to the --info action. |
| 11672 | Migrate code from plain ValueError to AmbiguousPackageName |
| zmedico | where appropriate (inherits from ValueError for backward |
| | compatibility). |
| 11673 | only use dummy echos in do_file() when running in |
| SpankMan | interactive mode |
svn path=/main/branches/prefix/; revision=11675
Fabian Groffen [Sat, 11 Oct 2008 15:44:10 +0000 (15:44 -0000)]
Merged from trunk -r11635:11654
| 11636 | Bug #240022 - Avoid duplicate output for the same library |
| zmedico | (due to symlinks) in display_preserved_libs() by using |
| | os.path.realpath() to group duplicate references together. |
| | Thanks to Fabian Groffen <grobian@g.o> for the initial |
| | patch. |
| 11637 | Fix KeyError raised from display_preserved_libs() when the |
| zmedico | realpath is used as a key in consumer_map instead of the |
| | orignal path that was returned from the |
| | PreservedLibsRegistry. |
| 11642 | In order to avoid "waiting for lock" messages at the |
| zmedico | beginning, which annoy users, never spawn a prefetcher for |
| | the first package. |
| 11643 | In doebuild(), don't create build dirs when "listonly" fetch |
| zmedico | mode. |
| 11644 | In fetch(), never call the pkg_nofetch phase when in |
| zmedico | "listonly" mode. |
| 11645 | Bug #234301 - Add support to EbuildFetcher to collect elog |
| zmedico | messages that might be generated during the pkg_nofetch |
| | phase. This involves maintaining a lock on PORTAGE_BUILDDIR |
| | where the elog messages are collected, and cleaning up |
| | PORTAGE_BUILDDIR before releasing the lock. |
| 11646 | Fix EbuildFetcher._wait_hook() so it can be called more than |
| zmedico | once without throwing an AttributeError. |
| 11647 | Make EbuildFetcher direct fetch output to the normal build |
| zmedico | log. By keeping the output in the build log instead of the |
| | global emerge-fetch.log file, output from a possible fetch |
| | failure can be recovered and displayed later. TODO: Convert |
| | failed fetch to elog message as suggested in bug #234301. |
| 11648 | Make EbuildFetcher clean up the build dir after failures in |
| zmedico | fetchonly mode since the log is in emerge-fetch.log anyway. |
| 11649 | When EbuildBuild encounters a failed fetch, propagee the log |
| zmedico | path so that it can be properly displayed in the status |
| | display. |
| 11650 | Make HOMEPAGE.missing fatal again since, in cases when |
| zmedico | homepages are no longer available, we can use a link to some |
| | site like packages.gentoo.org or |
| | www.unmaintained-free-software.org. |
| 11651 | Change the "qawarnings" variable from a list to a set. |
| zmedico | |
| 11652 | Make "qawarnings" a normal set since the missingvars code |
| zmedico | might modify it. |
| 11653 | Instead of using inheritance, reference the ConfigParser |
| zmedico | part of SetConfig as an attribute in case we want to swap |
| | out the ConfigParser implemention and no longer want to |
| | implement the whole interface. |
| 11654 | Generate elog messages for failed fetches. This restores |
| zmedico | some functionality that was removed in r11645. |
svn path=/main/branches/prefix/; revision=11674
Fabian Groffen [Sun, 5 Oct 2008 18:00:09 +0000 (18:00 -0000)]
Merged from trunk -r11632:11634
| 11633 | Avoid raising a KeyError from display_preserved_libs() in |
| zmedico | cases when no owners are found for a particular library |
| | consumer. |
| 11634 | Make HOMEPAGE.missing a warning since some packages become |
| zmedico | homeless even though they still continue to work. Thanks to |
| | Robin H. Johnson <robbat2@g.o> for the suggestion. |
svn path=/main/branches/prefix/; revision=11635
Fabian Groffen [Sun, 5 Oct 2008 16:46:05 +0000 (16:46 -0000)]
Merged from trunk -r11621:11630
| 11622 | A cpv can be returned from dbapi.match() as an old-style |
| zmedico | virtual match even in cases when the package does not |
| | actually PROVIDE the virtual. Filter out any such false |
| | matches inside depgraph._select_package() and |
| | _show_unsatisfied_dep(). Thanks to Ned Ludd <solar@g.o> for |
| | reporting this issue which was discovered when attempting to |
| | install virtual/libc on uclibc profile. Apparently the |
| | uclibc ebuilds need to be fixed to properly set PROVIDE when |
| | the metadata cache is generated. |
| 11623 | Bug #239529 - Fix 'doins' to work with symlinks to |
| zmedico | directories, like it did before the changes from bug |
| | #210575. |
| 11624 | Add missing quotes on pushd argument from previous commit. |
| zmedico | |
| 11625 | Redirect pushd and popd output to /dev/null when |
| zmedico | appropriate. |
| 11626 | Fix PreservedLibsRegistry.store() so that it only rewrites |
| zmedico | the data file when something has changed. |
| 11627 | Only update the confmem file when something has changed. |
| zmedico | |
| 11628 | * When ensuring sane $PWD in ebuild.sh, die if the `cd |
| zmedico | "$PORTAGE_BUILDDIR"` call fails. * Create $PORTAGE_BUILDDIR |
| | for the "fetch" phase too since it might be necessary to |
| | call pkg_nofetch. |
| 11629 | Bug #239529 - When doins is called on a symlink to a |
| zmedico | directory, preserve the name of the symlink for the |
| | installed directory. This involves temporarily renaming the |
| | directory and then renaming it back again. |
| 11630 | In dyn_clean, cd to $PORTAGE_BUILDDIR/.. before attempting |
| zmedico | to remove it since some kernels, such as Solaris, return |
| | EINVAL when an attempt is made to remove the current working |
| | directory. Thanks to Fabian Groffen <grobian@g.o> for |
| | reporting. |
svn path=/main/branches/prefix/; revision=11632
Fabian Groffen [Sun, 5 Oct 2008 16:38:39 +0000 (16:38 -0000)]
revert r11577, a proper fix is in 11630
svn path=/main/branches/prefix/; revision=11631
Fabian Groffen [Sat, 4 Oct 2008 09:59:25 +0000 (09:59 -0000)]
Merged from trunk 11616:11618
| 11617 | Make depgraph._add_pkg() take a Dependency instance. This |
| zmedico | provides access to the atom which pulled in the package, |
| | which may be needed in order to verify that a different |
| | package that's been added to the graph is capable of |
| | satisfying the atom. |
| 11618 | Fix depgraph._add_pkg() to ensure that the existing package |
| zmedico | in the graph matches the required atom in cases when a |
| | different package has been passed in. This solves a problem |
| | with silently unsatisfied USE deps that was reported by |
| | Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>. Now the |
| | unsatisfied dependency will result in a "slot conflict" |
| | rather than be silently ignored. |
svn path=/main/branches/prefix/; revision=11620
Fabian Groffen [Sat, 4 Oct 2008 09:57:18 +0000 (09:57 -0000)]
Make new changelog.ebuildadded check a warning instead of an error, since in Prefix, interrevisions are new ebuilds, but we do not use the ChangeLog for obvious maintenance reasons.
svn path=/main/branches/prefix/; revision=11619
Fabian Groffen [Fri, 3 Oct 2008 16:58:09 +0000 (16:58 -0000)]
Merged from trunk -r11602:11613
| 11603 | Generate an eqawarn message if econf is called from |
| zmedico | src_compile and src_configure is also defined. Thanks to |
| | Betelgeuse for the patch which I've modified to be silent in |
| | EAPI 0 or 1 in case ebuilds want to define src_configure in |
| | those EAPIs and call it manually from src_compile. |
| 11604 | Bug #239272 - Handle InvalidAtom exception inside |
| zmedico | depgraph.validate_blockers(). |
| 11605 | When parsing PORTAGE_ELOG_SYSTEM, stack values in a dict so |
| zmedico | that things like "echo:info echo:qa" stack like one might |
| | expect. Thanks to Betelgeuse for reporting. |
| 11606 | Call elog_process before calling the "clean" phase for |
| zmedico | --buildpkgonly mode. |
| 11607 | Fix broken logic in Scheduler._main_loop() which would allow |
| zmedico | the main loop to exit while one or more merges are still |
| | scheduled. Thanks to Patrick Lauer for reporting. |
| 11608 | Optimize display_preserved_libs() by using a single |
| zmedico | getFileOwnerMap() to look up all the files. |
| 11609 | In JobStatusDisplay._update(), set _displayed = True when |
| zmedico | ruturning early due to stdout not being a tty. This fixes a |
| | problem excess output which was reported by Daniel Robbins. |
| 11610 | Implement a new "changelog.ebuildadded" check which causes |
| zmedico | repoman to bail out if an ebuild has been added and the |
| | ChangeLog has not been modified. This was requested by Robin |
| | H Johnson <robbat2@g.o> since it is a requirement for the |
| | packages.gentoo.org ChangeLog code. |
| 11611 | Remove pointless copying of the owners dict inside |
| zmedico | display_preserved_libs(). |
| 11613 | Fix `svn status` output parsing for compatibility with |
| zmedico | subversion-1.6. Thanks to Arfrever for this patch. |
svn path=/main/branches/prefix/; revision=11616
Fabian Groffen [Fri, 3 Oct 2008 16:53:25 +0000 (16:53 -0000)]
Merged from trunk -r11593:11602
| 11594 | For compatibility with long-standing --columns behavior, do |
| zmedico | not display "uninstall" or satsified "blocks" nodes in the |
| | merge list when --columns is enabled. Thanks to solar for |
| | the suggestion. |
| 11595 | make sure that cli-defined sets aren't added to @world |
| genone | |
| 11596 | allow selection of metadata source for VariableSet |
| genone | |
| 11597 | remove the 'repository' option from CategorySet in favor of |
| genone | the generic 'intersect' option |
| 11598 | Add a new DummyPackageSet handler to make set operators |
| genone | easier to use |
| 11599 | allow the portage.sets. prefix to be omitted in 'class' |
| genone | options of set definitions |
| 11600 | Bug #239006 - In FakeVartree._aux_get_wrapper(), fall back |
| zmedico | to vdb metadata if the live ebuild's EAPI is unsupported. |
| 11601 | Now that elog_base() uses 'echo -e' to expand escape codes |
| zmedico | prior to using 'read' to split on newlines, it's safe to use |
| | newlines as delimiters in the log file since 'read' is |
| | guaranteed to split any newlines contained in the arguments. |
| 11602 | Handle InvalidDependString from portdbapi.getFetchMap() |
| zmedico | inside search.output(). Thanks to agaffney for reporting. |
svn path=/main/branches/prefix/; revision=11615
projects / portage.git / log