Fabian Groffen [Thu, 10 Dec 2009 08:48:37 +0000 (08:48 -0000)]
remove unneccessary import
svn path=/main/branches/prefix/; revision=15025
Fabian Groffen [Thu, 10 Dec 2009 08:14:14 +0000 (08:14 -0000)]
Merged from trunk -r14994:15019
| 14995 | In movefile(), always use stat_obj[stat.ST_MTIME] for the |
| zmedico | integral timestamp which is returned, since the |
| | stat_obj.st_mtime float attribute rounds *up* if the |
| | nanosecond part of the timestamp is
999999881 ns or greater. |
| 14996 | Detect cases when long(stat_obj.st_mtime) != |
| zmedico | stat_obj[stat.ST_MTIME] due to rounding up, and truncate |
| | digits as necessary to preserve the integral seconds portion |
| | of the mtime. |
| 14997 | Handle permission problems when trying to cache the remote |
| zmedico | Packages file from a binhost. Thanks to Jeremy Olexa |
| | <darkside@g.o> for reporting. |
| 15014 | Don't enable EAPI 4_pre1 yet. |
| zmedico | |
| 15015 | Remove extra comman in comment. |
| zmedico | |
| 15019 | Fix introspection code in fetch() so that it works correctly |
| zmedico | when myuris is an OrderedDict instance. This fixes broken |
| | fetching for some packages. |
svn path=/main/branches/prefix/; revision=15023
Fabian Groffen [Wed, 9 Dec 2009 21:35:33 +0000 (21:35 -0000)]
dodoc somehow slipped through
svn path=/main/branches/prefix/; revision=14994
Fabian Groffen [Wed, 9 Dec 2009 21:19:36 +0000 (21:19 -0000)]
Merged from trunk -r14975:14992
| 14992 | Remove obsolete env-update.sh script. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14993
Fabian Groffen [Wed, 9 Dec 2009 20:11:20 +0000 (20:11 -0000)]
align with trunk
svn path=/main/branches/prefix/; revision=14991
Fabian Groffen [Wed, 9 Dec 2009 20:06:21 +0000 (20:06 -0000)]
EAPI="prefix" is nostalgic, but not reality, make the example read EAPI="3", and update it accordingly
svn path=/main/branches/prefix/; revision=14990
Fabian Groffen [Wed, 9 Dec 2009 20:00:04 +0000 (20:00 -0000)]
drop silly replacement in comment
svn path=/main/branches/prefix/; revision=14989
Fabian Groffen [Wed, 9 Dec 2009 19:59:44 +0000 (19:59 -0000)]
add back chown command from trunk, I hope it won't break
svn path=/main/branches/prefix/; revision=14988
Fabian Groffen [Wed, 9 Dec 2009 19:51:00 +0000 (19:51 -0000)]
De-prefixify this script, since it doesn't look like it's going to work. Actually, this seems to be legacy that needs to be removed, since there is a python version (env-update) that calls the Portage internal implementation, which is of course entirely Prefix aware.
svn path=/main/branches/prefix/; revision=14987
Fabian Groffen [Wed, 9 Dec 2009 19:39:29 +0000 (19:39 -0000)]
I actually checked it out and found this was removed
svn path=/main/branches/prefix/; revision=14986
Fabian Groffen [Wed, 9 Dec 2009 19:38:09 +0000 (19:38 -0000)]
revert prefixication for libtool hack, that's no longer in use
svn path=/main/branches/prefix/; revision=14985
Fabian Groffen [Wed, 9 Dec 2009 19:00:23 +0000 (19:00 -0000)]
Rename --with-default-path into --with-extra-path, since it never completely defines DEFAULT_PATH (it only appends) and we need to ensure that whatever is given always comes as last in the PATH. Added full compatability for non Prefix (trunk) by setting DEFAULT_PATH to the expected value as in trunk when no offset prefix is used.
svn path=/main/branches/prefix/; revision=14984
Fabian Groffen [Wed, 9 Dec 2009 18:30:52 +0000 (18:30 -0000)]
add a little sticky for myself
svn path=/main/branches/prefix/; revision=14983
Fabian Groffen [Wed, 9 Dec 2009 18:25:37 +0000 (18:25 -0000)]
use neutral wording
svn path=/main/branches/prefix/; revision=14982
Fabian Groffen [Wed, 9 Dec 2009 18:19:53 +0000 (18:19 -0000)]
align with prepallinfo
svn path=/main/branches/prefix/; revision=14981
Fabian Groffen [Wed, 9 Dec 2009 18:18:17 +0000 (18:18 -0000)]
avoid cd-ing into ED, which may not exist, omit unnecessary cd at the same time
svn path=/main/branches/prefix/; revision=14980
Fabian Groffen [Wed, 9 Dec 2009 18:03:23 +0000 (18:03 -0000)]
add extra newline, reduce diff with trunk
svn path=/main/branches/prefix/; revision=14979
Fabian Groffen [Wed, 9 Dec 2009 17:55:40 +0000 (17:55 -0000)]
we don't use EPREFIX anywhere in here
svn path=/main/branches/prefix/; revision=14978
Fabian Groffen [Wed, 9 Dec 2009 17:49:51 +0000 (17:49 -0000)]
Merged from trunk -r14969:14975
| 14970 | Don't assign f to sys.stderr inside EOutput._write(). |
| zmedico | |
| 14971 | When temporarily replacing the sys.std* streams, use the |
| zmedico | normal open() func in python3 so that we get the right class |
| | (otherwise our code that expects the 'buffer' attribute will |
| | break). |
| 14972 | Use ImportError handling to import _TextTestResult which |
| zmedico | moved from unittest to unittest.runner in python-2.7. Thanks |
| | to Arfrever for the suggestion. |
| 14973 | Fix handling for TEMP, TMP, and TMPDIR variables: * Add to |
| zmedico | whitelist so current values are always used. * Always filter |
| | them from the saved environment. * Always add thier values |
| | to SANDBOX_WRITE. |
| 14974 | When overridding sys.std* in python2, use binary streams. |
| zmedico | |
| 14975 | Add localization variables (LANG and LC_*) to the |
| zmedico | environment whitelist and filter them from the saved |
| | environment (so user settings override those of binary |
| | packages). Thanks to Fabio Erculiani <lxnay@g.o> for |
| | reporting. |
svn path=/main/branches/prefix/; revision=14977
Fabian Groffen [Wed, 9 Dec 2009 17:48:32 +0000 (17:48 -0000)]
Merged from trunk -r14963:14969
| 14965 | Bump EAPI conditionals to account for rename of EAPI 3 to 4. |
| zmedico | Thanks to Jonathan Callen <abcd@g.o> for this patch. |
| 14966 | Move ebuild helpers to account for rename of EAPI 3 to 4. |
| zmedico | |
| 14967 | Add OrderedDict class. |
| zmedico | |
| 14968 | Use OrderedDict in portdbapi.getFetchMap() so that order in |
| zmedico | $A corresponds to order in SRC_URI. |
| 14969 | When reading the remote Packages file for --getbinpkg, use |
| zmedico | codecs.iterdecode to decode the stream. Also, don't use |
| | finally to close the atomic_ofstream when writing the file |
| | since we want it to abort if an exception is raised. |
svn path=/main/branches/prefix/; revision=14976
Fabian Groffen [Mon, 7 Dec 2009 16:35:33 +0000 (16:35 -0000)]
Merged from trunk -r14950:14963
| 14951 | Fix possibly unsafe modification of list during iteration |
| zmedico | inside update_config_files(). |
| 14953 | Inside dblink._merge(), make sure PORTAGE_BUILDDIR still |
| zmedico | exists before trying to call ebuild success/die hooks, since |
| | it might have already been removed by fail-clean (and the |
| | hooks would have already been called). |
| 14955 | Make more code conditional on existence of PORTAGE_BUILDDIR |
| zmedico | inside dblink._merge(). |
| 14957 | Remove unnecessary elog_process() phasefilter arguements. |
| zmedico | |
| 14958 | Remove unused filter_phases, filter_mergephases, and |
| zmedico | filter_unmergephases functions. |
| 14963 | Copy the unittest._TextTestResult class from python-2.6 |
| zmedico | since it's been removed in python-2.7. |
svn path=/main/branches/prefix/; revision=14964
Fabian Groffen [Sun, 6 Dec 2009 10:34:05 +0000 (10:34 -0000)]
Merged from trunk -r14926:14936
| 14927 | Always append QA Notices resulting from the build log search |
| zmedico | to the end of the log. Thanks to Diego E. Pettenò for |
| | reporting. |
| 14928 | Bug #162404 - Automatically disable logging if sesandbox is |
| zmedico | enabled and a pty is not available for some reason |
| | (currently they are never available with python3). |
| 14929 | Bug #295805 - Fix ValueError with python3 inside |
| zmedico | update_config_files(). |
| 14930 | Move code for handling missing sandbox binary out of the |
| zmedico | config constructor. |
| 14931 | Use portage.StringIO to avoid duplicate import fallback |
| zmedico | code. |
| 14932 | Make register_die_hook() ensure that each hook is registered |
| zmedico | only once. |
| 14933 | Add a AbstractEbuildProcess class for MiscFunctionsProcess |
| zmedico | to inherit the _pipe and _can_log methods that used to be in |
| | the EbuildProcess class. |
| 14934 | Fix _spawn_misc_sh() to properly unset EBUILD_PHASE, and add |
| zmedico | a 'phase' description parameter for use in messages. |
| 14935 | Add 'tla' to the lists of live eclasses. |
| zmedico | |
| 14936 | Bug #295715 - Implement a register_success_hook function to |
| zmedico | complement register_die_hook, and also add code to ensure |
| | the die hooks are called even when the failure is on the |
| | python side (like for file collisions). |
svn path=/main/branches/prefix/; revision=14940
Fabian Groffen [Sun, 6 Dec 2009 10:32:37 +0000 (10:32 -0000)]
Merged from trunk -r14916:14926
| 14921 | Bug #295351 - Make update_dbentries() return unicode if it's |
| zmedico | given unicode, and bytes if it's given bytes. |
| 14922 | Bug #280336, comment #2 - Clear the package selection cache |
| zmedico | when packages are added to the graph. This fixes incorrect |
| | choices that happen in some cases. |
svn path=/main/branches/prefix/; revision=14939
Fabian Groffen [Sun, 6 Dec 2009 10:31:36 +0000 (10:31 -0000)]
Merged from trunk -r14906:14916
| 14907 | Bug #294886 - Show some basic info at the beginning of the |
| zmedico | build log, including USE flags. |
| 14909 | In FakeVartree.sync(), skip the aux_get wrapper when |
| zmedico | populating old-style virtuals, in order to avoid unwanted |
| | cache generation with --nodeps (reported by Arfrever). |
| 14913 | Revert r14901 since it doesn't solve the problem (bug |
| zmedico | #294945). |
| 14914 | Bug #294945 - Fix blocker satistfied state handling inside |
| zmedico | depgraph, to avoid a KeyError when displaying blockers. |
| 14915 | Fix deprecated usage of dep_getkey(). Thanks to Sebastian |
| zmedico | Mingramm (few) for reporting. |
svn path=/main/branches/prefix/; revision=14938
Fabian Groffen [Sun, 6 Dec 2009 10:30:18 +0000 (10:30 -0000)]
Merged from trunk -r14896:14906
| 14897 | In movefile(), skip os.utime() when os.rename() succeeds, in |
| zmedico | order to completely preserve mtime resolution. |
| 14898 | Fix logic from previous commit so it only applies when a |
| zmedico | 'newmtime' parameter has not been specified (this is always |
| | the case when called by portage). |
| 14899 | In calc_depclean(), load the FakeVartree before using it. |
| zmedico | This fixes a regression which causes incomplete graph |
| | creation (since r14773). Thanks to Vlastimil Babka |
| | <caster@g.o> for reporting. |
| 14900 | Add a note about lack of nanosecond precision in movefile(). |
| zmedico | |
| 14901 | Handle a KeyError in depgraph._ordered_tree_display(), |
| zmedico | reported on irc by romildo. |
svn path=/main/branches/prefix/; revision=14937
Fabian Groffen [Thu, 26 Nov 2009 14:21:57 +0000 (14:21 -0000)]
missed the last piece of code that assumes ED exists
svn path=/main/branches/prefix/; revision=14896
Fabian Groffen [Thu, 26 Nov 2009 14:06:35 +0000 (14:06 -0000)]
Merged from trunk -r14884:14886
| 14885 | Use einfo instead of ewarn for the "Skipping make test/check |
| zmedico | due to ebuild restriction." message. |
| 14886 | Set built=True when creating Package instances. This fixes a |
| zmedico | problem with --resume, reported by Sebastian Mingramm (few). |
svn path=/main/branches/prefix/; revision=14895
Fabian Groffen [Thu, 26 Nov 2009 14:03:06 +0000 (14:03 -0000)]
don't assume ED to exist
svn path=/main/branches/prefix/; revision=14894
Fabian Groffen [Wed, 25 Nov 2009 16:10:39 +0000 (16:10 -0000)]
Revert, add little hack to get Vim past it
svn path=/main/branches/prefix/; revision=14884
Fabian Groffen [Wed, 25 Nov 2009 16:07:28 +0000 (16:07 -0000)]
fix syntax error
svn path=/main/branches/prefix/; revision=14883
Fabian Groffen [Wed, 25 Nov 2009 16:06:54 +0000 (16:06 -0000)]
fix syntax error
svn path=/main/branches/prefix/; revision=14882
Fabian Groffen [Wed, 25 Nov 2009 15:55:01 +0000 (15:55 -0000)]
more avoidance to accessing ED, which may not exist
svn path=/main/branches/prefix/; revision=14881
Fabian Groffen [Wed, 25 Nov 2009 15:13:31 +0000 (15:13 -0000)]
Merged from trunk -r14852:14876
| 14853 | Disable backtracking in the depgraph constructor call when |
| zmedico | appropriate. |
| 14854 | Bug #293730 - Fix bad || choices triggered in some cases |
| zmedico | inside _dep_check_composite_db._visible() when --update is |
| | not enabled. |
| 14855 | Fix depgraph._prune_tree_display() to preserve uninstall |
| zmedico | tasks. Thanks to Jonathan Callen <abcd@g.o> for reporting. |
| 14856 | Fix blocker display to work properly with --tree |
| zmedico | --unordered-display. |
| 14857 | In depgraph._serialize_tasks(), ensure that unsolvable |
| zmedico | blockers can't be accidentally marked as satisfied. |
| 14858 | Tweak logic from previous commit. |
| zmedico | |
| 14859 | Optimized the code for bug #288083 and make it handle more |
| zmedico | cases. Now Package instances have 'visible' and 'masks' |
| | attributes, since this information needs to be accessed in |
| | more places now. |
| 14873 | Bug #293998 - Use OSError.errno instead of trying to |
| zmedico | subscript the exception when handling errno.EXDEV in |
| | movefile(), since exceptions do not support subscripting in |
| | python3. |
| 14874 | Add "repository" attribute to CategorySet (revert r11597). |
| zmedico | Thanks to TGL <tom.gl@free.fr> for this patch, posted on bug |
| | #291414. |
| 14875 | Bug #293614 - When the backtracking limit is reached and |
| zmedico | there is a SLOT conflict to display, hint that a larger |
| | --backtrack value might solve the conflict automatically. |
| 14876 | Add a test case which simply compiles all modules, useful |
| zmedico | for testing syntax compatibility with the current version of |
| | python. |
svn path=/main/branches/prefix/; revision=14880
Fabian Groffen [Wed, 25 Nov 2009 12:06:52 +0000 (12:06 -0000)]
try to be more resistant against missing $ED dir, at the same time clean up a bit removing unnecessary checks
svn path=/main/branches/prefix/; revision=14879
Fabian Groffen [Wed, 25 Nov 2009 11:34:29 +0000 (11:34 -0000)]
avoid duplicate/useless lines in NEEDED.XCOFF.1 (aix)
Patch by Michael Haubenwallner
svn path=/main/branches/prefix/; revision=14878
Fabian Groffen [Wed, 25 Nov 2009 11:33:07 +0000 (11:33 -0000)]
stop referencing _eapi0_src_install, this aligns with trunk
svn path=/main/branches/prefix/; revision=14877
Fabian Groffen [Thu, 19 Nov 2009 20:19:48 +0000 (20:19 -0000)]
Merged from trunk -r14820:14845
| 14821 | Bug #291200 - Make --quiet-build set PORTAGE_QUIET=1, so |
| zmedico | that --unmerge is quiet. |
| 14822 | Bug #288083 - Always warn about installed packages masked by |
| zmedico | license, since the user likely wants to adjust |
| | ACCEPT_LICENSE. For updates masked by license, warn if |
| | --complete-graph or --deep is given, since otherwise it is |
| | likely a waste of time. |
| 14823 | In the code from bug #288083, only show one LICENSE masking |
| zmedico | message per slot. |
| 14824 | Remove SLOT.missing since SLOT.invalid handles that case |
| zmedico | now. |
| 14844 | Bug #293448 - Fix TypeError when sending mail with python3, |
| zmedico | triggered by this issue: http://bugs.python.org/issue6521. |
| | Thanks to Albert W. Hopkins <marduk@python.net> for this |
| | patch. |
| 14845 | Check for updates masked by license for any installed |
| zmedico | packages that have been added to the graph (regardless of |
| | --deep or --complete-graph).. |
svn path=/main/branches/prefix/; revision=14850
Fabian Groffen [Thu, 19 Nov 2009 20:18:09 +0000 (20:18 -0000)]
ported LinkageMap fix from -r14820 to LinkageMapMachO and LinkageMapXCOFF. LinkageMapPECOFF seems to have adifferent code path that the same fix cannot be applied to
svn path=/main/branches/prefix/; revision=14849
Fabian Groffen [Thu, 19 Nov 2009 19:48:32 +0000 (19:48 -0000)]
Merged from trunk -r14819:14820
| 14820 | Inside LinkageMap.rebuild(), ensure that all preserved |
| zmedico | libraries have an entry in self._obj_properties, even when |
| | they fail to appear in scanelf output. This is important in |
| | order to prevent findConsumers from raising an unwanted |
| | KeyError. |
svn path=/main/branches/prefix/; revision=14848
Fabian Groffen [Wed, 18 Nov 2009 21:17:00 +0000 (21:17 -0000)]
Merged from trunk -r14813:14819
| 14814 | Bug #292664 - Show ACCEPT_LICENSE in emerge --info. |
| zmedico | |
| 14815 | Inside iter_owners, only cache a maximum of 25 dblink |
| zmedico | instances, in order to avoid potentially running out of |
| | memory. |
| 14816 | Add setup phases to the tail of the merge queue instead of |
| zmedico | the front, since otherwise when merging binary packages we |
| | sometimes tend to get a large number of setup phases |
| | flooding the queue and preventing queued installs from |
| | running. |
| 14817 | Implement dblink.__hash__ and __eq__, so that `portageq |
| zmedico | owners` correctly groups search results. Also, increase |
| | iter_owners dblink cache size from 25 to 100 instances. |
| 14818 | Bug #292910 - Don't mix print() and writemsg_stdout(), in |
| zmedico | order to avoid buffering issues. |
| 14819 | Bug #292820 - Make the Package constructor handle invalid |
| zmedico | SLOT values. |
svn path=/main/branches/prefix/; revision=14847
Fabian Groffen [Wed, 18 Nov 2009 21:08:42 +0000 (21:08 -0000)]
be more informative about what wrapper is barfing and where to find it (because rm-ing it usually helps)
svn path=/main/branches/prefix/; revision=14846
Fabian Groffen [Wed, 11 Nov 2009 21:11:51 +0000 (21:11 -0000)]
previous commit was too optimistic, pass on the required variables onto the new functions
svn path=/main/branches/prefix/; revision=14813
Fabian Groffen [Wed, 11 Nov 2009 20:24:03 +0000 (20:24 -0000)]
Merged from trunk -r14803:14808
| 14804 | Restore support for bash-3. |
| arfrever | |
| 14805 | Bug #278336 - Use adjust_config to set PORTAGE_QUIET when |
| zmedico | the config is reloaded after sync, so that PORTAGE_QUIET is |
| | set when the post_sync script is executed. |
| 14806 | Bug #292528 - Specify UTF-8 in the MIMEText constructor |
| zmedico | arguments, in order to avoid conversiont to ascii and |
| | subsequent UnicodeEncodeError when sending mail. The idea |
| | comes from here: http://bugs.python.org/issue4403#msg76425. |
| 14807 | Preserve previous usage of MIMEText constructor under |
| zmedico | python2, since it's known to work this way. |
| 14808 | Convert MIMEText body to string before sending. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14812
Fabian Groffen [Wed, 11 Nov 2009 20:22:58 +0000 (20:22 -0000)]
Merged from trunk -r14781:14803
| 14782 | Collapse two [[ ]] into one. |
| zmedico | |
| 14783 | Bug #291200 - Add a --quiet-build option to redirect all |
| zmedico | build output to logs alone, and do not display it on stdout. |
| 14784 | Use writemsg instead of print, to send debug messages to |
| zmedico | stderr. |
| 14798 | Fix typo in comment. |
| zmedico | |
| 14802 | When displaying masking messages, show the 'dependency |
| zmedico | required by' message before the masking docs message. |
| 14803 | Make split-elog bold. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14811
Fabian Groffen [Wed, 11 Nov 2009 20:21:08 +0000 (20:21 -0000)]
Merged from trunk -r14771:14781
| 14772 | Eliminate duplicate code from the FakeVartree constructor |
| zmedico | which does the same thing as FakeVartree.sync(). |
| 14773 | Move FakeVartree population out of the constructor by |
| zmedico | calling the sync() method explicitly. This allows the |
| | depgraph constructor avoid populating the FakeVartree, and |
| | delay it until depgraph._load_vdb() is called. |
| 14774 | Don't call FakeVartree.sync() redundantly when |
| zmedico | backtracking. |
| 14775 | Inside depgraph._complete_graph(), only pull in deps for |
| zmedico | the relevant root during remove operations. Thanks to |
| | acevery for reporting. |
| 14776 | Bug #291331 - Make send_mail() encode the unicode message |
| zmedico | as bytes before passing it to smtplib.SMTP.sendmail(), in |
| | order to avoid a UnicodeEncodeError which SMTP.send() tries |
| | to encode the message a plain ascii. |
| 14777 | Decode git output in _emerge.actions.git_sync_timestamps() |
| arfrever | for bug #291790. |
| 14778 | Define portage.proxy.objectproxy.ObjectProxy.__add__() to |
| arfrever | fix problem with string concatenation reported by dol-sen. |
| 14779 | Use writemsg instead of print, to send debug messages to |
| zmedico | stderr. |
| 14780 | Bug #291142 - Fix some cases when a 'missed update' message |
| zmedico | might not be displayed. |
| 14781 | For --debug mode, enable bash tracing when sourcing the |
| zmedico | ebuild. |
svn path=/main/branches/prefix/; revision=14810
Fabian Groffen [Wed, 11 Nov 2009 20:19:31 +0000 (20:19 -0000)]
It makes no sense to write an ${EPREFIX}/etc/ld.so.conf file since it'll never be used by ld.so. It makes no sense to make that code Prefix enabled for that reason either. Don't run it on a Prefix install.
svn path=/main/branches/prefix/; revision=14809
Fabian Groffen [Sun, 1 Nov 2009 10:56:19 +0000 (10:56 -0000)]
Merged from trunk -r14750:14767
| 14751 | Bug #259697 - Update IUSE.invalid docs for GLEP 56. |
| zmedico | |
| 14753 | Bug #291271 - Make vardbapi._bump_mtime() create category |
| zmedico | directories when necessary. |
| 14754 | Make dblink.delete() remove empty parent category |
| zmedico | directories. |
| 14755 | Make cacheddir() always behave like EmptyOnError is True, |
| zmedico | since listdir() doesn't handle a None return value |
| | correctly. |
| 14760 | Bug #290921 - Always exit unsuccessfully if -r is not |
| zmedico | specified and a directory is skipped. This reverts a |
| | behavior change from r9484. |
| 14761 | Allow unmerge of packages from the "selected" set when a |
| zmedico | package set such as @unavailable is given on the command |
| | line. Thanks to Vlastimil Babka <caster@g.o> for reporting. |
| 14762 | For compatibility, still exit successfully if there are |
| zmedico | skipped directories. We can make it more strict later. |
| 14763 | Add a --backtrack=COUNT option to control how many times |
| zmedico | backtracking is allowed, and reduce the default from 30 to |
| | 5. |
| 14767 | Fix --backtrack option handling. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14771
Fabian Groffen [Fri, 30 Oct 2009 21:41:43 +0000 (21:41 -0000)]
add finetunings by haubi
svn path=/main/branches/prefix/; revision=14748
Fabian Groffen [Fri, 30 Oct 2009 21:39:56 +0000 (21:39 -0000)]
Fix logic error, don't want to run XCOFF checks on ELF systems
svn path=/main/branches/prefix/; revision=14747
Fabian Groffen [Wed, 28 Oct 2009 20:40:24 +0000 (20:40 -0000)]
Attempt to align this more with trunk
- reshuffle qa_check code using functions such that the order is the
same as in trunk, but with some extra offsets
(at the same time avoid running QA checks for platforms other than the
current one)
- split out elf, macho, pecoff, xcoff, misc and prefix qa code blocks,
keep a bit of general (misc) checks in the original qa_check func for
the point mentioned above
- only chdir to ${D}, not ${ED}, this has the advantage that if that
fails we're on the same panic level as normal Portage, and that we no
longer need default src_install implementations that just create
${ED} to avoid a failing QA check, like bug #290245
svn path=/main/branches/prefix/; revision=14746
Fabian Groffen [Wed, 28 Oct 2009 19:38:53 +0000 (19:38 -0000)]
Add preserve-libs support for AIX' XCOFF, patch by Michael Haubenwallner
svn path=/main/branches/prefix/; revision=14745
Fabian Groffen [Wed, 28 Oct 2009 19:27:43 +0000 (19:27 -0000)]
make sure we don't do the wrong thing when no libtool files are found, patch by Michael Haubenwallner
svn path=/main/branches/prefix/; revision=14744
Fabian Groffen [Wed, 28 Oct 2009 18:36:02 +0000 (18:36 -0000)]
Merged from trunk -r14724:14735
| 14725 | Don't set mtime on downloaded metadata.dtd when using |
| zmedico | python3, since the rfc822.parsedate() function is not |
| | available. Thanks to Arfrever for reporting. |
| 14728 | Use calendar.timegm instead of time.mktime, for correct |
| zmedico | timezone handling. |
| 14729 | Add a parsedate() function which emulates |
| zmedico | rfc822.parsedate(), since python3 doesn't have it. |
| 14730 | Add -R as a shortcut for --depclean. Thanks to Jonathan |
| zmedico | Callen <abcd@g.o> for the suggestion. |
| 14731 | Take the -c option and make it mean --depclean instead of |
| zmedico | --clean, since --clean is pretty useless anyway. |
| 14732 | Add a reference to bug #141118 inside |
| zmedico | _expand_new_virtuals(). |
| 14733 | Revert the workaround for bug #288863. This will require a |
| zmedico | dependency on >=sys-apps/sandbox-2.2. |
| 14734 | Bug #290625 - Manually encode output to stdout in python3, |
| zmedico | in order to avoid potential UnicodeEncodeError exceptions. |
| 14735 | Bug #290428 - Update mtime of /var/db/pkg and category |
| zmedico | subdirectories when stuff inside is modified, so that |
| | consumers can use directory mtimes to validate caches. |
svn path=/main/branches/prefix/; revision=14743
Fabian Groffen [Sat, 24 Oct 2009 12:16:59 +0000 (12:16 -0000)]
another occurrence of CONFIG_MEMORY_FILE which already includes EPREFIX, so don't add it again, thanks Nikolas Olivier in bug #290254
svn path=/main/branches/prefix/; revision=14724
Fabian Groffen [Sat, 24 Oct 2009 11:22:31 +0000 (11:22 -0000)]
Merged from trunk -r14701:14710
| 14702 | Factor the --tree code out of depgraph.display(). |
| zmedico | |
| 14703 | Add a --unordered-display option for use with --tree. This |
| zmedico | allows the display to be optimized differently since the |
| | merge order is not preserved. Thanks to Sebastian Mingramm |
| | (few) for the initial patch. |
| 14704 | Factor out duplicate "These are the packages that would be |
| zmedico | merged", "Calculating dependencies", and spinner cleanup |
| | code. |
| 14705 | Factor vdb loading code out of the depgraph constructor, |
| zmedico | since this procedure is slow and it generates spinner |
| | output, which isn't very nice behavior for a constructor. |
| | Now it's called on-demand by various methods when necessary. |
| 14706 | Bug #289967 - Update installsources rsync code for |
| zmedico | >=debugedit-4.4.6-r2. Thanks to Peter Alfredsen |
| | <loki_val@g.o> for this patch. |
| 14707 | Use find with -print0 for absolute safety. |
| zmedico | |
| 14708 | Add --help output for --unordered-display, and move man page |
| zmedico | docs from the actions to the options section. |
| 14709 | Use urllib.urlopen() instead of portage.fetch() for fetching |
| zmedico | metadata.dtd. |
| 14710 | Bug #134466 - Add a --ask-enter-invalid option. When used |
| zmedico | together with the --ask option, interpret a single "Enter" |
| | key press as invalid input. This helps prevent accidental |
| | acceptance of the first choice. |
svn path=/main/branches/prefix/; revision=14723
Fabian Groffen [Sat, 24 Oct 2009 11:13:39 +0000 (11:13 -0000)]
Try to resolve the openpty misery this time for real. Moved documentation about test_openpty_eof into that function, reenabled disabling openpty on Solaris (it got lost previously breaking Portage on Solaris) and hoping that Interix gets openpty again now, as it doesn't work with pipes.
svn path=/main/branches/prefix/; revision=14721
Fabian Groffen [Sat, 24 Oct 2009 10:59:48 +0000 (10:59 -0000)]
CONFIG_MEMORY_FILE already includes EPREFIX, so don't add it again, thanks Nikolas Olivier in bug #290254
svn path=/main/branches/prefix/; revision=14720
Fabian Groffen [Wed, 21 Oct 2009 19:35:29 +0000 (19:35 -0000)]
move dohtml.py into the correct location, no idea how it could end up in the wrong dir
svn path=/main/branches/prefix/; revision=14701
Fabian Groffen [Tue, 20 Oct 2009 15:26:57 +0000 (15:26 -0000)]
Merged from trunk -r14674:14696
| 14675 | Fix messages broken in r14616. Thanks to Arfrever for |
| zmedico | reporting and thanks to Jonathan Callen <abcd@g.o> for this |
| | patch. |
| 14676 | Move filtering of misc bash variables from |
| zmedico | save_ebuild_env() to filter_readonly_variables(). Add |
| | additional variables found in the output of `env -i bash -c |
| | 'declare -p'`. |
| 14677 | Add a boolean expand_nested_sets parameter to |
| zmedico | SetConfig.getSetAtoms(). This will be useful for adding |
| | support to the dependency graph for keeping track of |
| | precisely which nested set each atom comes from. |
| 14678 | Revert r14677 since it doesn't interact well with the |
| zmedico | 'extend', 'remove', and 'intersect' code in |
| | SetConfig.getSetAtoms(). |
| 14679 | Remove support for 'extend', 'remove', and 'intersect' |
| zmedico | sets.conf section attributes in SetConfig.getSetAtoms() |
| | since the current implementation does not meet user |
| | expectations, as mentioned in bug #253802, comment #5: |
| | Package set operators currently operate on atoms, but what |
| | users really need is for them to operate on the packages |
| | themselves. This will allow one set to add or subtract |
| | packages from another even though the sets to not use the |
| | exact same atoms to refer to the given packages. I imagine |
| | the way this should be done is to create a mapping of atom |
| | -> package for each set, perform the intersection using the |
| | packages, and then map the package intersection back into a |
| | set of atoms. |
| 14680 | Add support for display of nested sets in --depclean and |
| zmedico | --prune reverse dependency output. This also fixes a bug |
| | from the 'selected' set changes which could cause the |
| | system set to be disregarded in some cases. |
| 14681 | Bug #259697 - Update IUSE.invalid docs for glep 56. Thanks |
| zmedico | to Alec Warner <antarus@g.o> for this patch. |
| 14694 | drop IMAGE -- people have had years to catch up |
| SpankMan | |
| 14695 | Remove the docs for the extend, remove, and intersect |
| zmedico | attributes that are not supported now. |
| 14696 | Fix license_groups parsing to stack the lists, so |
| zmedico | license_groups from overlays extend groups from the main |
| | tree instead of overwritting them. Thanks to Vlastimil |
| | Babka <caster@g.o> for reporting. |
svn path=/main/branches/prefix/; revision=14700
Fabian Groffen [Tue, 20 Oct 2009 15:23:13 +0000 (15:23 -0000)]
fix double prefix, thanks Ramon van Alteren, bug #289835
svn path=/main/branches/prefix/; revision=14699
Fabian Groffen [Sun, 18 Oct 2009 14:52:19 +0000 (14:52 -0000)]
remove files that should be links
svn path=/main/branches/prefix/; revision=14674
Fabian Groffen [Sun, 18 Oct 2009 14:30:29 +0000 (14:30 -0000)]
kill / that I introduced compared to trunk
svn path=/main/branches/prefix/; revision=14673
Fabian Groffen [Sun, 18 Oct 2009 14:20:27 +0000 (14:20 -0000)]
sync NEWS file with trunk
svn path=/main/branches/prefix/; revision=14672
Fabian Groffen [Sun, 18 Oct 2009 13:29:15 +0000 (13:29 -0000)]
Merged from trunk -r14635:14667
| 14660 | Ind SetConfig.getSetAtoms(), don't assume the set has a |
| zmedico | 'creator' attribute, since if sets.conf is corrupt then |
| | emerge generates fallback sets without the 'creator' |
| | attribute. |
| 14662 | Preserve variables which have been set in global scope |
| arfrever | using 'declare'. |
| 14663 | Remove reference to non-existent _source_ebuild function. |
| zmedico | |
| 14664 | Fix breakage in DEFINED_PHASES code. |
| zmedico | |
| 14665 | Add a --use-ebuild-visibility option, for using unbuilt |
| zmedico | ebuild metadata in visibility checks for built ebuilds. |
| | Thanks to Sebastian Mingramm (few) for reporting the |
| | problem and testing the patch. |
| 14666 | Warn aabout default world and system set configuration |
| zmedico | being used when sets.conf is corrupt. Thanks to Thanks to |
| | Sebastian Mingramm (few) for the suggestion. |
| 14667 | Convert --select to boolean True when enabled, so --resume |
| zmedico | code handles it like other boolean options. |
svn path=/main/branches/prefix/; revision=14671
Fabian Groffen [Sun, 18 Oct 2009 13:27:06 +0000 (13:27 -0000)]
Merged from trunk -r14625:14635
| 14626 | Inside dep_zapdeps(), detect cases such as || ( foo:1 foo:2 |
| zmedico | ), where we want to prefer the atom which matches the higher |
| | version rather than the atom furthest to the left. Sorting |
| | is done separately for each of choice_bins, so as not to |
| | interfere with the ordering of the bins. Because of the bin |
| | separation, the main function of this code is to allow |
| | --depclean to remove old slots (rather than to pull in new |
| | slots). |
| 14627 | Fix repoman breakage from previous commit. |
| zmedico | |
| 14628 | Make cpv_getkey() use catpkgsplit() insead of a separate |
| zmedico | regex. |
| 14629 | Bug #227225 - Add *DEPEND.badtilde warning for ~ operator |
| zmedico | used with non-zero revision. Thanks to David Leverton |
| | <levertond@googlemail.com> for this patch. |
| 14630 | Automatically create a fallback setconfig, so emerge isn't |
| zmedico | crippled due to misssing/corrupt/outdated sets.conf. This is |
| | especially important since WorldSet has been renamed to |
| | WorldSelectedSet, and thus new and old sets.conf files are |
| | incompatible. |
| 14631 | Call config._init_dirs() from emerge so that it's not called |
| zmedico | every time the portage api is imported. |
svn path=/main/branches/prefix/; revision=14670
Fabian Groffen [Sun, 18 Oct 2009 13:24:30 +0000 (13:24 -0000)]
Merged from trunk -r14615:14625
| 14616 | Bug #273648 - EAPI 3 - the following condtions must be met: |
| zmedico | 1. The A variable contains no items. 2. The phase function |
| | in question is not in DEFINED_PHASES. 3. None of the phase |
| | functions unpack, prepare, configure, compile or install, if |
| | supported by the EAPI in question and occurring prior to the |
| | phase about to be executed, are in DEFINED_PHASES. Thanks to |
| | Jonathan Callen <abcd@g.o> for this patch. |
| 14617 | Simplify the conditionals from bug #273648. Thanks to |
| zmedico | Jonathan Callen <abcd@g.o> for this patch. |
| 14618 | Make phase variable local in has_phase_defined_up_to(). |
| zmedico | |
| 14619 | In dyn_unpack, check mtimes on $A instead of $AA. Thanks to |
| zmedico | Jonathan Callen <abcd@g.o> for reporting. |
| 14620 | Fix WorldHandler to use the "selected" set. |
| zmedico | |
| 14621 | Use [ "${foo+set}" = set ] instead of "${foo-unset}" != |
| zmedico | unset ], to avoid any possility of ambiguity. Thanks to |
| | Jonathan Callen <abcd@g.o> for the suggestion. |
| 14622 | Fix einstall() change from previous commit, for |
| zmedico | compatibility with empty but set CONF_PREFIX. Thanks to |
| | Jonathan Callen <abcd@g.o> for reporting. |
| 14623 | Use short substitution syntax in use_with() and |
| zmedico | use_enable(). Thanks to Jonathan Callen <abcd@g.o> for this |
| | patch. |
| 14624 | Bug #273643 - Don't export AA in EAPI 3. Thanks to Jonathan |
| zmedico | Callen <abcd@g.o> for the initial patch (I moved the code |
| | from spawnebuild to config.environ). |
| 14625 | Bug #273636 - Add doins and newins support for symlink |
| zmedico | preservation in EAPI 3. Thanks to Jonathan Callen <abcd@g.o> |
| | for the initial patch (I added EAPI conditionals in order to |
| | share code between all EAPIs). |
svn path=/main/branches/prefix/; revision=14669
Fabian Groffen [Sun, 18 Oct 2009 13:23:01 +0000 (13:23 -0000)]
Merged from trunk -r14605:14615
|14606 |Only call _test_pty_eof() on Linux, since it seems to hang on most other kernels. |
|zmedico|This should fix the hang reported on FreeBSD here: |
| |http://archives.gentoo.org/gentoo-alt/msg_d81c5e8c6dd6849312ecb048feb41c5b.xml |
|14607 |Add the "test" flag to implicit IUSE, so handling of FEATURES=test is consistent |
|zmedico|regardless of explicit IUSE. Users may use use.mask and package.use.mask to |
| |control FEATURES=test for all ebuilds, regardless of explicit IUSE. |
|14609 |Add back info_vars docs accidentally removed in r14587. Thanks to Arfrever for |
|zmedico|reporting. |
|14610 |Bug #289068 - Avoid KeyError: USE when depgraph calls _getMissingLicenses. |
|zmedico| |
|14611 |TODO: Make resume_depgraph() return reasons for dropped_tasks, for |
|zmedico|display/logging. |
|14612 |Ensure that /dev/std* streams have appropriate sandbox permission for bug #288863.|
|zmedico|This can be removed after sandbox is fixed and portage depends on the fixed |
| |version. |
|14613 |Remove soname_cache inside calc_depclean() since LinkageMap caches that already. |
|zmedico| |
|14614 |Bug #266454 - Make @world an all-inclusive set once again, like it was prior to |
|zmedico|portage-2.2_rc* releases. In addition to @system, @world now includes a @selected |
| |set which represents user-selected "world" packages and sets that saved in |
| |/var/lib/portage/world{,sets}. |
|14615 |Bug #287869 - Add a --selective[=n] option (inverse of --oneshot). This is useful |
|zmedico|if you want to use EMERGE_DEFAULT_OPTS to make --oneshot behavior default. |
svn path=/main/branches/prefix/; revision=14668
Fabian Groffen [Thu, 15 Oct 2009 16:22:18 +0000 (16:22 -0000)]
we need python-2.6 for exception syntax
svn path=/main/branches/prefix/; revision=14608
Fabian Groffen [Wed, 14 Oct 2009 19:41:43 +0000 (19:41 -0000)]
Merged from trunk -r14587:14601
| 14589 | Add a reference to GLEP 23. |
| zmedico | |
| 14591 | Update ACCEPT_LICENSE and ACCEPT_PROPERTIES docs. |
| zmedico | |
| 14593 | Add a note about ACCEPT_LICENSE. |
| zmedico | |
| 14597 | Implement FetchlistDict.__len__, in order to avoid infinite |
| zmedico | recursion in some cases. |
| 14598 | Implement __len__. |
| zmedico | |
| 14599 | When --depclean pulls in the provider of a library because |
| zmedico | of installed consumers, display the soname(s) of the |
| | consumed libraries. |
| 14600 | Bug #288906 - Fix Scheduler._dblink_elog() to always append |
| zmedico | messages to the build log if available (regardless whether |
| | or not message goes to stdout). |
| 14601 | Add some examples for ACCEPT_LICENSE and ACCEPT_PROPERTIES. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14605
Fabian Groffen [Wed, 14 Oct 2009 19:38:06 +0000 (19:38 -0000)]
Merged from trunk -r14577:14587
| 14579 | Bug #288551 - Handle invalid cpv in portdbapi.aux_get() by |
| zmedico | raising KeyError. |
| 14581 | Rename dohtml to dohtml.py. Next commit will add a shell |
| zmedico | script wrapper for EPYTHON handling. |
| 14582 | Use a shell script for dohtml instead of a function, for |
| zmedico | xargs compatibility. |
| 14585 | Use a shell script wrapper for EPYTHON handling. |
| zmedico | |
| 14587 | Document license_groups. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14604
Fabian Groffen [Wed, 14 Oct 2009 19:24:16 +0000 (19:24 -0000)]
Merged from trunk -r14567:14577
| 14568 | Set EPYTHON variable as empty when calling portageq or |
| arfrever | dohtml to avoid using potentially unsupported version of |
| | Python. |
| 14570 | Add some more EPYTHON safety. |
| zmedico | |
| 14573 | Fix python shebangs. s:/usr/bin/env python:/usr/bin/python: |
| zmedico | |
| 14575 | Add a xpak-helper.py script, so that shell code always |
| zmedico | calls python via a shebang. |
| 14577 | Bug #288551 - Fix portageq to handle |
| zmedico | portage.exception.AmbiguousPackageName instead of |
| | ValueError. |
svn path=/main/branches/prefix/; revision=14603
Fabian Groffen [Wed, 14 Oct 2009 19:21:19 +0000 (19:21 -0000)]
Merged from trunk -r14556:14567
| 14557 | Document 'backtracking' in the MASKED PACKAGES section. |
| zmedico | |
| 14559 | Discard the log on success, since otherwise we'll have |
| zmedico | multiple log files for the same package. |
| 14561 | Add a note about --update and bug #275945 for 2.1.7. |
| zmedico | |
| 14562 | Fix formatting. |
| zmedico | |
| 14564 | Add notes about python3 support. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14602
Fabian Groffen [Sat, 10 Oct 2009 10:47:49 +0000 (10:47 -0000)]
Merged from trunk -r14552:14553
| 14553 | Bug #288025 - Avoid AttributeError on OSes that don't have |
| zmedico | os.statvfs. |
svn path=/main/branches/prefix/; revision=14555
Fabian Groffen [Sat, 10 Oct 2009 10:40:35 +0000 (10:40 -0000)]
use single quotes, it seems at least we need this, bug #285720
svn path=/main/branches/prefix/; revision=14552
Fabian Groffen [Sat, 10 Oct 2009 10:26:14 +0000 (10:26 -0000)]
Merged from trunk -r14525:14548
| 14526 | Ask for the output of 'emerge --info' instead of 'emerge |
| arfrever | --info =$CATEGORY/$PF'. Suggested by zmedico. |
| 14527 | Add back Arfrever's emerge --info change because it's good |
| zmedico | and I was just confused. |
| 14528 | Handle AUTOCLEAN and NOCOLOR case insensitivity inside |
| zmedico | config. |
| 14529 | Add a --color < y | n > option so that color output can be |
| zmedico | forced. This is going to be used by emerge to force color |
| | fetch output when appropriate. |
| 14530 | Force consistent color output, in case we are capturing |
| zmedico | fetch output through a normal pipe due to unavailability of |
| | ptys. Thanks to grobian for reporting. |
| 14531 | Bug #274497 - Misc spelling, grammar, and terminology |
| zmedico | fixes, including URL -> URI and FOO's -> FOOs. |
| 14532 | Bug #273099 - Add split-log and split-elog FEATURES for |
| zmedico | splitting build logs and elog mod_save logs into category |
| | subdirectories. Thanks to Sebastian Mingramm (few) for this |
| | patch. |
| 14533 | Add --changed-use as an alias for --reinstall=changed-use. |
| zmedico | Thanks to Jeremy Olexa <darkside@g.o> for the suggestion. |
| 14534 | Fix error in --changed-use logic. |
| zmedico | |
| 14535 | Fix ugly 'Candidates' --debug output. |
| zmedico | |
| 14548 | Add news for 2.1.7. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14551
Fabian Groffen [Sat, 10 Oct 2009 10:23:41 +0000 (10:23 -0000)]
Merged from trunk -r14515:14525
| 14516 | Enable pty support on FreeBSD. |
| zmedico | |
| 14517 | Bug #287950 - Add support for FEATURES=fail-clean which is |
| zmedico | useful for cleaning up temp files on tmpfs after build |
| | failures with --keep-going. |
| 14518 | Bug #287950 - Add a --fail-clean[=n] option, for enabling |
| zmedico | or disabling FEATURES=fail-clean from the command line. |
| 14519 | Fix typo in FEATURES=news docs. Thanks to Jonathan Callen |
| zmedico | <en.ABCD@gmail.com> for this patch. |
| 14520 | Bug #267468 - Display the total number of binary packages |
| zmedico | in the merge list. Thanks to Sebastian Mingramm (few) for |
| | this patch. |
| 14521 | Bug #270933 - Make the "If you need support ..." message |
| zmedico | ask for emerge --info and the build.log. Thanks to |
| | Sebastian Mingramm (few) for this patch. |
| 14522 | Bug #271551 - Inside depgraph.select_files(), avoid bailing |
| zmedico | out due to an ambiguous package name in cases when all but |
| | one of the resolved packages are virtual. Thanks to |
| | Sebastian Mingramm (few) for this patch. |
| 14523 | Bug #272000 - When --keep-going is enabled, don't |
| zmedico | completely bail out at the beginning due to corrupt |
| | manifest(s). Thanks to Sebastian Mingramm (few) for this |
| | patch. |
| 14524 | Fix "TabError: inconsistent use of tabs and spaces in |
| arfrever | indentation" with Python 3 which was introduced in r14522. |
| 14525 | Ask for the output of 'emerge --info =$CATEGORY/$PF'. |
| arfrever | |
svn path=/main/branches/prefix/; revision=14550
Fabian Groffen [Wed, 7 Oct 2009 19:19:22 +0000 (19:19 -0000)]
haubi reported that openpty no longer works on AIX either, so let's finish this and don't do openpty on non-Linux any more. Will port this to trunk.
svn path=/main/branches/prefix/; revision=14514
Fabian Groffen [Wed, 7 Oct 2009 19:14:00 +0000 (19:14 -0000)]
Merged from trunk -r14507:14510
| 14508 | Bug #265267 - Add hint about |
| zmedico | --accept-properties=-interactive in the --jobs docs. |
| 14509 | Use the stricter _pkgsplit function. |
| zmedico | |
| 14510 | Bug #274870: Add file.size.fatal check in repoman. |
| arfrever | |
svn path=/main/branches/prefix/; revision=14513
Fabian Groffen [Wed, 7 Oct 2009 19:12:18 +0000 (19:12 -0000)]
Merged from trunk -r14497:14507
| 14498 | Enable FEATURES=news by default and document it. |
| zmedico | |
| 14499 | When restarting emerge, don't trust sys.argv[0] since |
| zmedico | eselect-python may modify it. |
| 14500 | Add a 'digest.missing' check, for cases like mythtv where |
| zmedico | the eclass has modified the SRC_URI and now the Manifest has |
| | missing digests. Thanks to Brian Harring for the suggestion. |
| 14501 | Add a new --accept-properties option so that users can |
| zmedico | temporarily override ACCEPT_PROPERTIES on the commandline, |
| | without relying on emerge's legacy behavior of allowing |
| | variables to leak in from the calling environment. A typical |
| | usage example for this option would be to use |
| | --accept-properties=-interactive to temporarily mask |
| | interactive packages. With default configuration, this would |
| | result in an effective ACCEPT_PROPERTIES value of "* |
| | -interactive". |
| 14502 | Add a note about --accept-properties and exclusion of |
| zmedico | interactive updates. |
| 14504 | Bug #287870 - Add -r option as short version of --resume. |
| zmedico | |
| 14505 | Fix collision in variable name 'x'. |
| zmedico | |
| 14506 | Exempt installed packages from PROPERTIES masking since the |
| zmedico | user is likely to temporarily alter ACCEPT_PROPERIES in |
| | order to avoid interactive updates and we don't want this to |
| | distort resolver choices or trigger warning messages about |
| | installed packages being masked. |
| 14507 | Bug #265267 - When disabling --jobs due to interactive |
| zmedico | package(s), hint about --accept-properties=-interactive |
| | option. |
svn path=/main/branches/prefix/; revision=14512
Fabian Groffen [Wed, 7 Oct 2009 19:09:55 +0000 (19:09 -0000)]
Merged from trunk -r14487:14497
| 14488 | fix mis-alignment |
| grobian | |
| 14489 | Restrict upstream.workaround to src_compile and src_install |
| volkmar | as much as possible. Prevent warnings when using emake -j1 |
| | in src_test which is recommanded. |
| 14490 | Add src_configure and pkg_config to the list of phases in |
| arfrever | repoman.checks.PhaseCheck.__init__(). |
| 14491 | Make pkgsplit() accept a cpv again, since accepting a pv |
| zmedico | only will probably break lots of api consumers. Thanks to |
| | Romain Perier <mrpouet@g.o> for reporting epkginfo |
| | breakage. |
| 14492 | Use the simpler/stricter _pkgspit in dbapi code. |
| zmedico | |
| 14493 | Use _pkgsplit when input cannot contain a category. |
| zmedico | |
| 14494 | Make pkgsplit() preserve 'null' category if it's present in |
| zmedico | the input. |
| 14495 | Make deprecated_profile_check() suggest to use eselect |
| zmedico | profile. Thanks to Samuli Suominen <ssuominen@g.o> for the |
| | suggestion. |
| 14496 | * Add default ACCEPT_LICENSE and ACCEPT_PROPERTIES values |
| zmedico | in make.globals. * Set default values if missing from |
| | make.globals. * Only warn once if a given license group is |
| | missing. * Prune off any parts of an ACCEPT_LICENSE and |
| | ACCEPT_PROPERTIES that are made irrelevant by the latest |
| | occuring * or -* wildcard. |
| 14497 | - move news into features so it can be ignored when needed. |
| solar | Lots of whitespace cleanups |
svn path=/main/branches/prefix/; revision=14511
Fabian Groffen [Sun, 4 Oct 2009 08:14:46 +0000 (08:14 -0000)]
Merged from trunk -r14484:14485
| 14485 | Generate an eerror message in dblink.mergeme when a file has |
| zmedico | to be renamed in order to merge a directory to the same |
| | path. |
svn path=/main/branches/prefix/; revision=14487
Fabian Groffen [Sat, 3 Oct 2009 21:07:27 +0000 (21:07 -0000)]
- do not calculate source with of isolated-functions (for die function)
as we don't print it
- move paths to the bottom and print ${S} as it's often necessary when a
package fails.
- move error message up directly after the message it says it failed
(printing it below the code snippet usually just repeats the message)
svn path=/main/branches/prefix/; revision=14484
Fabian Groffen [Sat, 3 Oct 2009 20:39:36 +0000 (20:39 -0000)]
use more verbose trace notation from trunk
svn path=/main/branches/prefix/; revision=14481
Fabian Groffen [Sat, 3 Oct 2009 17:28:16 +0000 (17:28 -0000)]
Merged from trunk -r14472:14478
| 14474 | Bug #287333 - If posible, use ebuild from tree when checking |
| zmedico | for keyword mask on installed packages. |
| 14476 | Bug #285832 - When updates are missed due to dependencies |
| zmedico | that have been masked by backtracking, abbreviate output in |
| | order to avoid terminal flooding. |
| 14477 | Don't use a fork inside _test_pty_eof() because it gives |
| zmedico | inconsistent results. |
| 14478 | Fix race condition when using a fork inside _test_pty_eof(). |
| zmedico | |
svn path=/main/branches/prefix/; revision=14480
Fabian Groffen [Sat, 3 Oct 2009 10:08:26 +0000 (10:08 -0000)]
linkmap is already of the right type, instantiating a new object based on that seems to work
svn path=/main/branches/prefix/; revision=14479
Fabian Groffen [Fri, 2 Oct 2009 20:58:01 +0000 (20:58 -0000)]
Resolve conflict, bah
svn path=/main/branches/prefix/; revision=14475
Fabian Groffen [Fri, 2 Oct 2009 20:40:28 +0000 (20:40 -0000)]
Merged from trunk -r14463:14472
| 14465 | Fix SyntaxError with Python 3 added in r14462. |
| arfrever | |
| 14466 | Take regular expressions from portage.dep and use them to |
| zmedico | reimplement portage.versions.pkgsplit(). This simplifies |
| | the code and helps guarantee consistency package |
| | name/version validation. |
| 14467 | Use a regular expression for SLOT validation inside |
| zmedico | vardbapi.aux_get(). |
| 14468 | Bug #286895 - Generate an eerror message when a directory |
| zmedico | blocks merge of a regular file and the file is merged using |
| | a 'config protect' filename even though the path may not be |
| | among those covered by CONFIG_PROTECT. |
| 14469 | Add --tolerant option (already in use on master rsync |
| zmedico | mirror), requested by robbat2. |
| 14470 | Remove libtool from RDEPEND.suspect list, since libltdl.so |
| zmedico | is validly used by some packages at runtime. Thanks to |
| | Samuli Suominen <ssuominen@g.o> for reporting. |
| 14471 | Bug #285191 - Remove the RDEPEND.implicit check because it |
| zmedico | is invalid. |
| 14472 | Bug #287333 - Fix the code from bug #252167 so it behaves |
| zmedico | consistently regardless of the package (ebuild or binpkg) |
| | being masked. |
svn path=/main/branches/prefix/; revision=14473
Fabian Groffen [Tue, 29 Sep 2009 20:29:30 +0000 (20:29 -0000)]
Merged from trunk -r14455:14463
| 14458 | Bug #286780 - Fix email.MIME* imports to use email.mime.* |
| zmedico | (works with python 2.6 and python 3). Thanks to Hanno |
| | Meyer-Thurow <h.mth@web.de> for this patch. |
| 14459 | Don't call self.scan() in tbz2.__init__ since all methods |
| zmedico | call it anyway. |
| 14460 | Make tbz2.get_data() return an empty dict on failure. |
| zmedico | |
| 14461 | Handle encoding/decoding of unicode when using the xpak api. |
| zmedico | Use tbz2.get_data() instead of tbz2.getfile() when reading |
| | multiple values, in order to avoid multiple tbz2.scan() and |
| | searchindex() calls. |
| 14462 | Add back _PackageMetadataWrapper__setitem__, removed in |
| zmedico | r14280, since removing it seems to cause problems. Thanks to |
| | Jeremy Olexa <darkside@gentoo.org> for reporting, and Marat |
| | Radchenko <marat@slonopotamus.org> for bisecting to find the |
| | revision. |
| 14463 | Revert the rest of r14280 since it seems that dict bypasses |
| zmedico | __getitem__ and/or __setitem__ too often. |
svn path=/main/branches/prefix/; revision=14464
Fabian Groffen [Mon, 28 Sep 2009 20:32:37 +0000 (20:32 -0000)]
don't run all those expensice ELF checks on Darwin, it has scanelf, but it doesn't have ELF, make bundle check restrictable
svn path=/main/branches/prefix/; revision=14457
Fabian Groffen [Mon, 28 Sep 2009 18:31:35 +0000 (18:31 -0000)]
Merged from trunk -r14442:14455
| 14445 | Use mkdtemp() instead of hardcoded |
| zmedico | pym/portage/tests/bin/root directory. |
| 14446 | Use explicit imports instead of *. |
| zmedico | |
| 14447 | Fix binTestsInit() to use correct values for |
| zmedico | PORTAGE_BIN_PATH and PORTAGE_PYM_PATH. |
| 14448 | Use catsplit() instead of a regex to generate |
| zmedico | dbapi._categories. Thanks to Marat Radchenko |
| | <marat@slonopotamus.org> for this patch. |
| 14449 | Make _test_pty_eof() use non-blocking IO, required for |
| zmedico | Darwin kernel. |
| 14450 | Fix TypeError in clear_screen() in dispatch-conf which |
| arfrever | occurs when Python 3 is used (bug #286682). |
| 14451 | Make _test_pty_eof() fork when writing to the slave_fd, |
| zmedico | since otherwise it would block on some platforms such as |
| | Darwin. |
| 14452 | In _test_pty_eof(), call waitpid on the child process only |
| zmedico | after reading all the data from the pty. |
| 14453 | Try to avoid blocking on Darwin in _test_pty_eof() by using |
| zmedico | slave_fd directly instead of fdopen. |
| 14454 | Make _test_pty_eof() call process.spawn() instead of |
| zmedico | os.fork(). |
| 14455 | Fix breakage in file path -> package lookup code. |
| zmedico | |
svn path=/main/branches/prefix/; revision=14456
Fabian Groffen [Sun, 27 Sep 2009 09:17:01 +0000 (09:17 -0000)]
Merged from trunk -r14435:14442
| 14442 | Bug #286522 - Check all portdbapi.findname return values in |
| zmedico | case it returns None, and raise 'ebuild not found' |
| | exceptions when necessary. |
svn path=/main/branches/prefix/; revision=14444
Fabian Groffen [Sun, 27 Sep 2009 09:15:05 +0000 (09:15 -0000)]
don't mix ewarn and eqawarn, or the eqawarn messages won't be elogged (and hence repeated at the end)
svn path=/main/branches/prefix/; revision=14443
Fabian Groffen [Sat, 26 Sep 2009 20:48:32 +0000 (20:48 -0000)]
recently added _test_pty_eof does something which makes Darwin hang, so disable openpty now (which used to work fine)
svn path=/main/branches/prefix/; revision=14441
Fabian Groffen [Sat, 26 Sep 2009 18:50:47 +0000 (18:50 -0000)]
ahem, match shebang, not sheone
svn path=/main/branches/prefix/; revision=14440
Fabian Groffen [Sat, 26 Sep 2009 18:46:54 +0000 (18:46 -0000)]
Merged from trunk -r14432:14435
| 14433 | Revert r14430 and fix to do as intended. Thanks to Arfrever |
| zmedico | for reporting. |
| 14435 | Bug #286475 - Fix KeyValuePairFileLoader.lineParser() so it |
| zmedico | doesn't raise AttributeError when a key/value is redefined. |
svn path=/main/branches/prefix/; revision=14439
Fabian Groffen [Sat, 26 Sep 2009 18:46:04 +0000 (18:46 -0000)]
Merged from trunk -r14422:14432
| 14423 | Add a test case for this issue: |
| zmedico | http://bugs.python.org/issue5334 |
| 14424 | Fix length calculation so it doesn't assume the length of |
| zmedico | the encoded string is the same as the unicode string. |
| 14425 | Remove unused imports. |
| zmedico | |
| 14426 | Use imp.reload() instead of reload() for compatibility with |
| arfrever | Python 3. |
| 14427 | Define __bool__() for compatibility with Python 3. |
| arfrever | |
| 14428 | Remove ugly code from __len__, since defining __bool__ |
| zmedico | fixes the same issue. |
| 14429 | Fix formatting of sizes with Python 3. |
| arfrever | |
| 14430 | Make sure self._allowed_keys are sorted in the table create |
| zmedico | statement. They already are sorted, but do it explicitly |
| | here for clarity. |
| 14431 | Fix UnboundLocalError triggered by atom without category |
| zmedico | for nonexistent package. Thanks to Jeremy Olexa |
| | <darkside@gentoo.org> for reporting. |
| 14432 | Bug #285767 - Add support to to identify and eliminate |
| zmedico | redundant package selections when multiple atoms happen to |
| | specify a version range. |
svn path=/main/branches/prefix/; revision=14438
Fabian Groffen [Sat, 26 Sep 2009 18:44:55 +0000 (18:44 -0000)]
Merged from trunk -r14412:14422
| 14413 | Use a runtime check to see if |
| zmedico | http://bugs.python.org/issue5380 is fixed. |
| 14414 | Make _test_pty_eof() return None if openpty() fails. |
| zmedico | |
| 14415 | Add a test case for http://bugs.python.org/issue5380 and |
| zmedico | mark it as 'todo' since it fails with current versions of |
| | python 3. |
| 14416 | Fix regression in _getitem() from r14398, since |
| zmedico | myf.read().split("\n") yields an empty string at the end |
| | which is causes _parse_data() to catch a ValueError and |
| | raise CacheCorruption. |
| 14417 | Show an appropriate error message in _create_pty_or_pipe() |
| zmedico | if openpty() fails inside _test_pty_eof(). |
| 14418 | Remove unnecessary dict.has_key() call (fix for python 3). |
| zmedico | |
| 14419 | Fix ValueError in digestcheck(), reported by Arfrever. |
| zmedico | |
| 14420 | Fix more. |
| zmedico | |
| 14421 | Use list comprehensions instead of filter() or map() in |
| arfrever | some places for compatibility with Python 3. |
| 14422 | Use 'in' instead of has_key() in portage.glsa.Glsa.parse() |
| arfrever | when Python 3 is used. |
svn path=/main/branches/prefix/; revision=14437
Fabian Groffen [Sat, 26 Sep 2009 18:43:40 +0000 (18:43 -0000)]
Merged from trunk -r14402:14412
| 14412 | Use dict.__iter__ instead of keys(), since it behaves |
| zmedico | identically in python 2 and 3. |
svn path=/main/branches/prefix/; revision=14436
Fabian Groffen [Thu, 24 Sep 2009 18:34:43 +0000 (18:34 -0000)]
Fix syntax
svn path=/main/branches/prefix/; revision=14411
Fabian Groffen [Thu, 24 Sep 2009 18:23:22 +0000 (18:23 -0000)]
Make shebang check only fatal on scripts that are located in PATH, warn for those outside, as suggested by mduft and darkside. Turn the latter warn in a die too when FEATURES=stricter as suggeste by darkside and ulm.
svn path=/main/branches/prefix/; revision=14410