Fabian Groffen [Sat, 11 Apr 2009 11:38:43 +0000 (11:38 -0000)]
Due to too many conflicts, I have dropped support for EAPI=prefix sooner
than originally planned. This commit removes the bits from ebuild.sh.
Merged from trunk -r13296:13305
| 13297 | Make emerge --info display USE similarly to how they are |
| zmedico | displayed in the merge list. |
| 13298 | Make RecursiveFileLoader skip hidden directories, and only |
| zmedico | use a single stat call to check for existence and file type. |
| 13299 | Move the ebuild sourcing code into a new _source_ebuild() |
| zmedico | function. |
| 13300 | - Move DEFINED_PHASES code into _source_ebuild() and add it |
| zmedico | to the list of readonly variables. - Save DEFINED_PHASES in |
| | the vdb entries, as requested by lxnay. |
| 13301 | Call _ebuild_phase_funcs() from ebuild_main() since it needs |
| zmedico | to be called for every phase (for EAPI 2 default() phase |
| | function setup). |
| 13302 | Bug #265111 - Make current options override older options |
| zmedico | for --resume. |
| 13303 | Add UseFlagDisplay.sort_combined and sort_separated |
| zmedico | attributes that can be passed directly as key parameters to |
| | list.sort(). |
| 13304 | Reorganize emerge --info display, and make sure that the |
| zmedico | "cpv was built with the following" line is shown for every |
| | package. |
| 13305 | Don't try to execut the pkg_info phase if DEFINED_PHASES is |
| zmedico | available and it shows that the phase is undefined. |
svn path=/main/branches/prefix/; revision=13320
Fabian Groffen [Sat, 11 Apr 2009 11:26:37 +0000 (11:26 -0000)]
Merged from trunk -r13290:13296
|13291 |Add portdbapi support for a metadata/layout.conf file which specifies information |
|zmedico|about the repository layout. Currently, only a single "masters" attribute is |
| |supported, which is used to specify names of repositories which satisfy |
| |dependencies on eclasses and/or ebuilds. Each repository name should correspond |
| |the value of a repo_name entry from one of the repositories that is configured via|
| |the PORTDIR or PORTDIR_OVERLAY variables. Since layout.conf is now used to control|
| |eclass inheritance, it is now safer to use overlays which contain forked eclasses |
| |have names identical to those from the main tree. Such eclasses will only apply to|
| |their containing repository and any other repositories which reference their |
| |containing repository via layout.conf. This solves bug #124041 by containing |
| |eclass overrides so that they don't necessarily apply to all ebuilds. Thanks to |
| |Alistair Bush <ali_bush@g.o> for his initial patch for layout.conf support in |
| |repoman (will be merged later). See the "QA Overlay Layout support" thread on the |
| |gentoo-dev mailing list for more information: |
| |http://archives.gentoo.org/gentoo-dev/msg_33c61550b4ed2b7b25dd5a4110e1ec81.xml |
|13292 |Add a --repo option, allowing cache to be generated for overlays. |
|zmedico| |
|13293 |Fix code in the portdbapi constructor to cache eclass_cache.cache instances where |
|zmedico|appropriate. |
|13294 |Replace references to portdbapi.eclassdb with appropriate references for the |
|zmedico|specific repo. |
|13295 |Add support to repoman for using layout.conf to control which repositories are |
|zmedico|used to satisfy dependencies. Thanks to Alistair Bush <ali_bush@g.o> for the |
| |initial patch. See the "QA Overlay Layout support" thread on the gentoo-dev |
| |mailing list for more information: |
| |http://archives.gentoo.org/gentoo-dev/msg_33c61550b4ed2b7b25dd5a4110e1ec81.xml |
|13296 |Fix some _doebuild_exit_status_check() calls so that they only happen when the |
|zmedico|bash process exits successfully (for consistency with usage elsewhere). When |
| |calling this functions, we're mainly concerned about false success, and we always |
| |want to allow things like using bashrc die hooks to clean up $PORTAGE_BUILDDIR for|
| |users that are building in tmpfs (in which case the exit status file may be |
| |removed before bash exits). |
svn path=/main/branches/prefix/; revision=13319
Fabian Groffen [Sat, 11 Apr 2009 11:22:36 +0000 (11:22 -0000)]
Merged from trunk -r13286:13290
| 13287 | If there are not ebuilds matching a argument, only generate |
| zmedico | an error if there are also no cache entries matching the |
| | argument. |
| 13288 | Always generate an error if the target cache contains an |
| zmedico | apparently invalid cpv. |
| 13289 | Add an example for PORTAGE_IONICE_COMMAND. Thanks to |
| zmedico | Vlastimil Babka <caster@g.o> for the suggestion. |
| 13290 | Bug #262647 - Inside config.setcpv(), never add SRC_URI to |
| zmedico | the environment since that can cause execve() calls to fail |
| | with E2BIG errors. |
svn path=/main/branches/prefix/; revision=13318
Fabian Groffen [Fri, 3 Apr 2009 10:47:48 +0000 (10:47 -0000)]
shame on me
svn path=/main/branches/prefix/; revision=13286
Fabian Groffen [Fri, 3 Apr 2009 10:32:18 +0000 (10:32 -0000)]
FAIL
svn path=/main/branches/prefix/; revision=13285
Fabian Groffen [Fri, 3 Apr 2009 10:18:30 +0000 (10:18 -0000)]
Merged from trunk -r13280:13282
| 13281 | Inside tar_contents(), don't emulate tar --numeric-id |
| zmedico | option. The uid/gid might be different on the system where |
| | the package will be installed, so we need to store the |
| | actual user/group name in the tar file. |
| 13282 | Generate an error if there are no ebuilds found for a |
| zmedico | package that's specified on the commandline. |
svn path=/main/branches/prefix/; revision=13284
Fabian Groffen [Fri, 3 Apr 2009 10:16:35 +0000 (10:16 -0000)]
set BASH_BINARY and MOVE_BINARY based on what configure found
svn path=/main/branches/prefix/; revision=13283
Fabian Groffen [Thu, 2 Apr 2009 17:53:36 +0000 (17:53 -0000)]
Merged from trunk -r13278:13279
| 13279 | Bug #264245 - Revert i|=1 from r13242 since that breaks the |
| zmedico | array indexing code here. |
svn path=/main/branches/prefix/; revision=13280
Fabian Groffen [Thu, 2 Apr 2009 13:06:41 +0000 (13:06 -0000)]
Merged from trunk -r13262:13275
| 13263 | Add parsing code for --jobs and --load-average. |
| zmedico | |
| 13264 | Fix typo in comment. |
| zmedico | |
| 13265 | Automatically enable FEATURES=metadata-transfer if it's not |
| zmedico | enabled, instead of bailing out. |
| 13266 | Add support for a EGENCACHE_DEFAULT_OPTS variable in |
| zmedico | make.conf. |
| 13267 | Combine the --rdeps-only and --root-deps options into a |
| zmedico | single --root-deps option which takes an optional 'rdeps' |
| | argument. |
| 13268 | Clarify docs for --root-deps. |
| zmedico | |
| 13269 | Document new prepare and configure commands for EAPI 2. |
| zmedico | |
| 13270 | Add a man page for egencache(1). |
| zmedico | |
| 13271 | Allow --root-deps for ROOT=/, so people can do weird things |
| zmedico | like use it with -e to remerge deep runtime deps without |
| | pulling in build-time deps. It's not something we really |
| | want to advertise, but it's good to leave the option open in |
| | case it happens to be useful. Thanks to Ned Ludd <solar@g.o> |
| | for the suggestion. |
| 13272 | Remove the ATOMS section and move --update to a new ACTIONS |
| zmedico | section. |
| 13273 | Bug #264494 - In case the ebuild has enabled set -e during |
| zmedico | an ebuild phase, proactively call set +e inside qa_source(), |
| | qa_call(), and die(). |
| 13274 | - Add more info to the DESCRIPTION section. - Add a BUGS |
| zmedico | section to explain issues related to limitations in the |
| | cache format and its validation mechanism. |
| 13275 | Note that only updates to PORTDIR are currently supported. |
| zmedico | |
svn path=/main/branches/prefix/; revision=13278
Fabian Groffen [Thu, 2 Apr 2009 13:02:59 +0000 (13:02 -0000)]
Merged from trunk -r13253:13262
| 13254 | Add a cp_iter keyword argument to the MetadataRegen |
| zmedico | constructor, which can be used to do a regen for a subset |
| | of packages. TODO: Add support to cleanse cache for the |
| | specific cp values that are processed. |
| 13255 | Add support in MetadataRegen for cleansing stale cache when |
| zmedico | only a subset of packages are processed. |
| 13256 | Add a "consumer" keyword parameter to the MetadataRegen |
| zmedico | constructor which can be used to pass in a callback that is |
| | called for each ebuild that is processed (allowing access |
| | to the ebuild metadata). |
| 13257 | reword the qa execstack notice since it can be triggered by |
| SpankMan | pt_load sections and not stacks |
| 13258 | In MetadataRegen._metadata_exit(), notify the consumer of |
| zmedico | failures (in this case the metadata argument is None). |
| 13259 | When in --quiet mode, still show a message for failures in |
| zmedico | MetadataRegen._metadata_exit(). |
| 13260 | Bug #261377 - Add a new 'egencache' tool to generate |
| zmedico | metadata cache for distribution. It only have the most |
| | basic functionality now, and more features will be added |
| | later. Usage: egencache [options] --update [atom] ... |
| | Options: -h, --help show this help message and exit |
| | --update update metadata/cache/ (generate as necessary) |
| | --cache-dir=CACHE_DIR location of the metadata cache |
| | --config-root=CONFIG_ROOT location of portage config files |
| | --jobs=JOBS max ebuild processes to spawn |
| | --load-average=LOAD_AVERAGE max load allowed when spawning |
| | multiple jobs |
| 13261 | Bug #263370 - In create_message(), use email.header.Header |
| zmedico | to wrap the subject, as a workaround so that long subject |
| | lines are wrapped correctly by <=python-2.6 (gentoo bug |
| | #263370, python issue #1974). |
| 13262 | Add a new egencache --rsync option which enables a stat |
| zmedico | collision workaround for cases in which the content of a |
| | cache entry changes and neither the file mtime nor size |
| | changes (preventing rsync from detecting changes). See bug |
| | #139134. This option should only be needed for distribution |
| | via something like rsync, which relies on timestamps and |
| | file sizes to detect changes. It's not needed with git |
| | since that uses a more thorough mechanism which allows it |
| | to detect changed inode numbers (described in racy-git.txt |
| | in the git technical docs). |
svn path=/main/branches/prefix/; revision=13277
Fabian Groffen [Thu, 2 Apr 2009 12:58:32 +0000 (12:58 -0000)]
Merged from trunk -r13244:13253
| 13245 | Add support for --rdeps-only and --root-deps options which |
| zmedico | are useful in combination with $ROOT. Thanks to Ned Ludd |
| | <solar@g.o> for the initial patch. |
| 13246 | Add a --root option that sets $ROOT (complements the |
| zmedico | --config-root option). |
| 13247 | Document --root and --config-root. |
| zmedico | |
| 13248 | Inside depgraph.validate_blockers(), prevent false positives |
| zmedico | in PROVIDE virtual blocker matches that can occur for |
| | packages for packages that don't actual have the appropriate |
| | value in PROVIDE (triggered by profile 'virtuals' settings). |
| | Thanks to Ned Ludd <solar@g.o> for reporting. |
| 13249 | Fix bug in old-style virtuals code from previous commit. |
| zmedico | |
| 13250 | Update dep_getusedeps() docstring. Thanks to Douglass |
| zmedico | Anderson <dja@gendja.com>. |
| 13251 | Implement _use_dep.__repr__(). Thanks to Douglass Anderson |
| zmedico | for the suggestion. |
| 13252 | Bug #264291 - Fix inappropriate build dir creation for |
| zmedico | emerge --fetchonly. |
| 13253 | Fix --newuse code to compare installed package USE to the |
| zmedico | USE that a binary package was built with (instead of |
| | config["PORTAGE_USE"]). |
svn path=/main/branches/prefix/; revision=13276
Fabian Groffen [Sun, 29 Mar 2009 11:24:46 +0000 (11:24 -0000)]
remove prefix hack to inject prefix statically in iuse_implicit, it's in use.force now, so no longer necessary
svn path=/main/branches/prefix/; revision=13244
Fabian Groffen [Sun, 29 Mar 2009 07:48:52 +0000 (07:48 -0000)]
Merged from trunk -r13238:13242
| 13239 | Add (x of y ) package counter in the "Installing" message, |
| zmedico | similar to the counter show in the "Emerging" message. |
| | Thanks to Ned Ludd <solar@g.o> for the suggestion. |
| 13240 | Don't show the package counter for "Uninstalling" messages. |
| zmedico | |
| 13241 | Bug #243220 - Show messages in emerge.log when old versions |
| zmedico | are uninstalled for AUTOCLEAN. This reverts behavior so that |
| | messages which used to be generated prior to portage-2.1.5.x |
| | (when AUTOCLEAN was moved from emerge to dblink.treewalk()) |
| | are generated once again. |
| 13242 | In order to eliminate the possibility of integer overflay, |
| zmedico | replace things like ((ret+=$?)) with ((ret|=$?)). Thanks to |
| | zong_sharo for the suggestion. |
svn path=/main/branches/prefix/; revision=13243
Fabian Groffen [Fri, 27 Mar 2009 12:03:02 +0000 (12:03 -0000)]
Merged from trunk -r13200:13232
| 13201 | For consistency in output with other helpers, check for file |
| zmedico | existence before calling install. |
| 13202 | When copying symlink targets to temp files, use a private |
| zmedico | temp dir inside $T instead of using $T directly. |
| 13222 | In dyn_unpack(), don't force a new unpack when the ebuild |
| zmedico | mtime is newer than $WORKDIR, since that may be too touchy. |
| | The user can easily call the clean phase explicitly if they |
| | really want it. |
| 13224 | In portdbapi.findname2(), move some of the path joining out |
| zmedico | of the loop. |
| 13226 | Inside config.setcpv(), don't clear out |
| zmedico | self.configdict['pkg'] entirely since some values need to be |
| | reused sometimes. |
| 13227 | In config.setcpv(), make sure the current args are really |
| zmedico | identical to the previous args before returning early. |
| 13230 | Fix typo in comment. |
| zmedico | |
| 13232 | Make the argument hash in config.setcpv() a little stronger. |
| zmedico | |
svn path=/main/branches/prefix/; revision=13236
Fabian Groffen [Fri, 27 Mar 2009 11:45:43 +0000 (11:45 -0000)]
sync with trunk, remove our binhost url fix, better have same behaviour as trunk, whether or not this is better
svn path=/main/branches/prefix/; revision=13235
Fabian Groffen [Fri, 27 Mar 2009 11:43:55 +0000 (11:43 -0000)]
Remove EAPIPREFIX, remain backwards compatible for now by still accepting 'prefix' in EAPI, but not caring about it much. Prefix masking is done solely by our (for this reason) different keywords
svn path=/main/branches/prefix/; revision=13234
Fabian Groffen [Thu, 26 Mar 2009 21:27:57 +0000 (21:27 -0000)]
Merged from trunk -r13193:13198
| 13198 | Move checks for /usr/lib/distcc/bin and /usr/lib/ccache/bin |
| zmedico | to the python side and don't add distcc to CC and CXX when |
| | /usr/lib/distcc/bin doesn't exist since that won't |
| | necessarily work. Thanks to Jeroen Roovers <jer@g.o> for |
| | reporting the issue with adding distcc to CC. |
svn path=/main/branches/prefix/; revision=13200
Fabian Groffen [Thu, 26 Mar 2009 21:23:09 +0000 (21:23 -0000)]
We can no longer rely on the environment, since PATH initialisation is only done after parsing EAPI, hence we need to use absolute paths for our binaries too. Pick binaries from the Build EPREFIX, not the perhaps cross EPREFIX, except for PRELINK_BINARY, as I think that one should operate on the target, not the host, the others are host helper tools
svn path=/main/branches/prefix/; revision=13199
Fabian Groffen [Thu, 26 Mar 2009 20:55:38 +0000 (20:55 -0000)]
Merged from trunk -r13187:13193
| 13188 | In config.setcpv(), clear out self.configdict["pkg"] to make |
| zmedico | sure that no preexisting metadata leaks through here. |
| 13189 | In config.regenerate(), always synchronize self.features |
| zmedico | with self['FEATURES']. |
| 13193 | Make StaticFileSet.multiBuilder() filter hidden files and |
| zmedico | directories. Thanks to oahong for reporting. |
svn path=/main/branches/prefix/; revision=13197
Fabian Groffen [Thu, 26 Mar 2009 20:54:28 +0000 (20:54 -0000)]
Merged from trunk -r13184:13187
| 13185 | Bug #227265 - Make pkgsplit() allow "versiony looking parts" |
| zmedico | in package names, for pms compliance. Also, add |
| | corresponding test cases. |
| 13186 | Add test case for consecutive hyphens. |
| zmedico | |
| 13187 | Bug #227265 - Make pkgsplit() allow multiple consecutive |
| zmedico | hyphens in package names, and add corresponding test cases. |
svn path=/main/branches/prefix/; revision=13196
Fabian Groffen [Thu, 26 Mar 2009 20:53:23 +0000 (20:53 -0000)]
Merged from trunk -r13180:13184
| 13181 | Remove unused tar_opts variable inside unpack(). Thanks to |
| zmedico | zong_sharo for reporting. |
| 13182 | Fix domo and doexe to return non-zero if there are any |
| zmedico | errors. Thanks to zong_sharo for reporting. |
| 13183 | Move distcc and ccache PATH setup later, after EAPI is |
| zmedico | guaranteed to be known, so that it's possible to do |
| | indepenent EAPI-specific PATH modifications prior to the |
| | distcc/ccache modifications. |
| 13184 | Source bashrc after PATH tweaks inside ebuild_main(). |
| zmedico | |
svn path=/main/branches/prefix/; revision=13195
Fabian Groffen [Thu, 26 Mar 2009 20:45:18 +0000 (20:45 -0000)]
Merged from trunk -r13174:13180
| 13175 | Add support for FEATURES=parse-eapi-glep-55. This feature is |
| zmedico | only intended for experimental purposes and should not be |
| | enabled under normal circumstances. |
| 13176 | Remove redundant EAPI assingment inside |
| zmedico | doebuild_environment(). |
| 13178 | Update code for removing noauto from FEATURES since |
| zmedico | config.features is a set instead of a list now. |
| 13179 | Note that --noreplace takes precedence over options such as |
| zmedico | --newuse. |
| 13180 | Note that --noreplace takes precedence over options such as |
| zmedico | --newuse. |
svn path=/main/branches/prefix/; revision=13194
Fabian Groffen [Thu, 26 Mar 2009 20:42:02 +0000 (20:42 -0000)]
Merged from trunk -r13144:13174
| 13145 | Replace xrange() usage with normal iteration and enumerate() |
| zmedico | where appropriate. Thanks to Douglass Anderson |
| | <dja@gendja.com> for the initial patch. |
| 13146 | When triggering a fresh unpack inside dyn_unpack(), remove |
| zmedico | the .prepared, .configured and .installed files along with |
| | the others. |
| 13147 | Add "prepare" to the list of phases that trigger a warning |
| zmedico | about stale ${T}/environment. |
| 13148 | Make ebuild(1) detect ebuild/eclass changes and |
| zmedico | automatically source the ebuild atain in this case (even |
| | though $T/environment may already exist). This should help |
| | avoid confusion by ensuring that the latest changes to the |
| | ebuild/eclasses are reflected in the environment. |
| 13149 | Use a separate if/then to group boolean or'd expressions |
| zmedico | together, rather than a subshell. |
| 13150 | Only check for ebuild/eclass modification when a relevant |
| zmedico | phase is called. |
| 13168 | Fix misc typos in comments. |
| zmedico | |
| 13170 | When calling doebuild() to spawn the 'depend' phase, just |
| zmedico | call config.setcpv() since that should be enough (no need |
| | for separate reset or reload calls). |
| 13173 | Add support for FEATURES=parse-eapi-ebuild-head, which is |
| zmedico | similar to GLEP 55 except that the EAPI is parsed from the |
| | head of the ebuild (first 30 lines). This feature is only |
| | intended for experimental purposes and should not be enabled |
| | under normal circumstances. |
| 13174 | If a package is masked by EAPI then don't show any other |
| zmedico | masking reasons. |
svn path=/main/branches/prefix/; revision=13192
Fabian Groffen [Thu, 26 Mar 2009 20:36:48 +0000 (20:36 -0000)]
Merged from trunk -r13139:13144
| 13140 | Fix argument validation to allow file paths. Thanks to |
| zmedico | Arfrever for reporting. |
| 13141 | Add a temporary workaround for bug #263081 (partially |
| zmedico | reverts r12757). |
| 13142 | Remove pointless usage of xrange(). Thanks to Douglass |
| zmedico | Anderson <dja@gendja.com> for this patch. |
| 13143 | Inside config.environ(), skip stat call on $T/environment |
| zmedico | for phases such as 'clean' and 'depend' where environment |
| | filtering isn't needed. Thanks to Piotr Jaroszyński |
| | <peper@g.o> for reporting. |
| 13144 | Inside spawn(), avoid redundant os.access() and stat() calls |
| zmedico | on commonly spawned binaries such as BASH_BINARY, |
| | SANDBOX_BINARY, and FAKEROOT_BINARY. Thanks to Piotr |
| | Jaroszyński <peper@g.o> for reporting. |
svn path=/main/branches/prefix/; revision=13191
Fabian Groffen [Thu, 26 Mar 2009 20:35:11 +0000 (20:35 -0000)]
Merged from trunk -r13133:13139
| 13134 | Make config.features a set instead of a list. |
| zmedico | |
| 13135 | Add docstrings for the fd_pipes and returnpid parameters of |
| zmedico | doebuild(). |
| 13136 | Make sure mysettings.setcpv() always gets called when |
| zmedico | necessary inside doebuild_environment(). |
| 13137 | Fix try/except indentation so that 2to3 will recognize it. |
| zmedico | |
| 13138 | Fix try/except indentation so that 2to3 will recognize it. |
| zmedico | |
| 13139 | Normalize try/except indentation for compatibility with |
| zmedico | 2to3. |
svn path=/main/branches/prefix/; revision=13190
Fabian Groffen [Wed, 18 Mar 2009 10:44:42 +0000 (10:44 -0000)]
Merged from trunk -r13103:13131
| 13104 | Add missing brackets to [:upper:] and [:lower:] in |
| zmedico | _sb_append_var() tr arguments. |
| 13108 | Tweak grammar. |
| zmedico | |
| 13109 | Bug #262365 - Make the "portage.internal" category |
| zmedico | (prepalldocs check) a warning instead of fatal. |
| 13113 | Add make.conf for amd64-fbsd submitted by Timothy Redaelli |
| zmedico | <drizzt@g.o>. |
| 13114 | add m68k diff from kolla |
| SpankMan | |
| 13115 | Do not create hardlinks when merging CONFIG_PROTECTed files |
| zmedico | since config files shouldn't be hardlinked to eachother |
| | (for example, shadow installs several identical config |
| | files inside /etc/pam.d/). Thanks to Caleb Cushing |
| | <xenoterracide@gmail.com> for reporting. |
| 13116 | Bug #262485 - Handle InvalidAtom from dep_expand(). |
| zmedico | |
| 13117 | Punt fix-db.py since it's not really needed. It's been |
| zmedico | broken since 2.1.6 and nobody noticed until bug #262132 was |
| | filed. |
| 13118 | Bug #262365 - Punt the prepalldocs check until there is an |
| zmedico | alternative available in EAPI 3. |
| 13119 | Remove portage.internal docs (goes with previous commit). |
| zmedico | |
| 13126 | Validate argument atoms earlier for build actions. |
| zmedico | |
| 13130 | In order to avoid possible duplicate elog messages when |
| zmedico | using ebuild(1) to call the same phase multiple times, wipe |
| | out elog log files for the current phase just before |
| | executing the phase. Thanks to Mike Frysinger <vapier@g.o> |
| | for reporting. |
| 13131 | Update copyright headers. |
| zmedico | |
svn path=/main/branches/prefix/; revision=13133
Fabian Groffen [Wed, 18 Mar 2009 10:40:54 +0000 (10:40 -0000)]
remove eprefixify, its is now in prefix.eclass
svn path=/main/branches/prefix/; revision=13132
Fabian Groffen [Sat, 14 Mar 2009 12:08:49 +0000 (12:08 -0000)]
disable the use of openpty on Solaris as it seems Python's openpty implementation doesn't play nice on Solaris with Portage's behaviour causing hangs/deadlocks
svn path=/main/branches/prefix/; revision=13112
Fabian Groffen [Thu, 12 Mar 2009 21:08:18 +0000 (21:08 -0000)]
silence false positive
svn path=/main/branches/prefix/; revision=13103
Fabian Groffen [Thu, 12 Mar 2009 21:02:04 +0000 (21:02 -0000)]
avoid double checks, and problems due to grep not liking to grep directories
svn path=/main/branches/prefix/; revision=13102
Fabian Groffen [Thu, 12 Mar 2009 21:00:56 +0000 (21:00 -0000)]
unbreak my portage, find fails, means no ebuild helpers for me
svn path=/main/branches/prefix/; revision=13101
Fabian Groffen [Thu, 12 Mar 2009 20:14:26 +0000 (20:14 -0000)]
Quote portageuser and portagegroup some more, apparently necessary, thanks Jeremy Olexa, in bug #261372
svn path=/main/branches/prefix/; revision=13100
Fabian Groffen [Thu, 12 Mar 2009 20:07:48 +0000 (20:07 -0000)]
Merged from trunk -r13063:13091
| 13064 | Use ${x##*/} instead of calling basename. |
| zmedico | |
| 13065 | Bug #262096 - Add separate eerror, elog, eqawarn, and ewarn |
| zmedico | binaries for use by non-bash programs running inside the |
| | ebuild environment, such as sandbox. |
| 13066 | Also add an einfo binary. |
| zmedico | |
| 13067 | Use posix compatible find -perm arguments. Thanks to |
| zmedico | Timothy Redaelli <drizzt@g.o> for reporting. |
| 13068 | When translating portage uid/gid to root uid/gid after |
| zmedico | src_install on FreeBSD, temporarily remove all file flags |
| | inside $D in order to avoid EPERM errors. Thanks to Timothy |
| | Redaelli <drizzt@g.o> for reporting. |
| 13069 | Make dyn_clean ignore FEATURES=keepwork when [[ |
| zmedico | $EMERGE_FROM = binary ]] and remove shutil.rmtree() call |
| | from Binpkg._clean_exit() since dyn_clean is guaranteed to |
| | do a full clean now. |
| 13070 | Bug #261992 - Inside Binpkg._prefetch_exit(), avoid |
| zmedico | potention issues with shutil.rmtree() by just doing a |
| | minimal cleanup. |
| 13071 | Bug #261992 - Replace the EbuildBuildDir.clean() method |
| zmedico | with a clean_log() method since log cleanup is all that's |
| | currently needed and shutil.rmtree() can fail with |
| | "OSError: [Errno 36] File name too long" due to strange |
| | file names, or on FreeBSD it can fail with EPERM due to |
| | file flags in $D. |
| 13072 | Update docstring for EbuildBuildDir.clean_log(). |
| zmedico | |
| 13088 | Bug #261670 - Automatically revert the CHOST metadata to |
| zmedico | the initial value after src_install, in case the ebuild has |
| | changed it. |
| 13090 | cleanup sandbox env var handling -- make sure we dont |
| SpankMan | insert empty : sections and avoid unnecessary eval usage |
| 13091 | Filter _sb_append_var in save_ebuild_env(). |
| zmedico | |
svn path=/main/branches/prefix/; revision=13099
Fabian Groffen [Thu, 12 Mar 2009 20:01:45 +0000 (20:01 -0000)]
attempt to install ebuild helpers in their own directory
svn path=/main/branches/prefix/; revision=13098
Fabian Groffen [Thu, 12 Mar 2009 19:52:52 +0000 (19:52 -0000)]
make sure I don't forget to kill this lame script in the prefix ebuild
svn path=/main/branches/prefix/; revision=13097
Fabian Groffen [Thu, 12 Mar 2009 19:42:41 +0000 (19:42 -0000)]
put back prefix version that svn foobarfed about on the original commit :(
svn path=/main/branches/prefix/; revision=13096
Fabian Groffen [Thu, 12 Mar 2009 19:37:31 +0000 (19:37 -0000)]
Merged from trunk -r13062:13063
| 13063 | Move ebuild helpers into an ebuild-helpers subdirectory. |
| zmedico | |
svn path=/main/branches/prefix/; revision=13095
Fabian Groffen [Thu, 12 Mar 2009 19:21:56 +0000 (19:21 -0000)]
Merged from trunk -r12824:13062
| 13056 | Add new xpak.5 man page by Lars Hartmann chaotikaorg>. |
| zmedico | |
| 13059 | Bug #262012 - Only trigger the slot conflict message about |
| zmedico | --newuse when the installed version is the same as the new |
| | one. If they are different versions then there's some other |
| | problem. |
| 13060 | Bug #262211 - Make vardbapi.aux_get() translate empty SLOT |
| zmedico | to 0 since other code expects non-empty SLOT (for generation |
| | package slot atoms). |
| 13061 | Bug #262211 - Avoid triggering an InvalidAtom exception |
| zmedico | inside the Package constructor when SLOT is empty. |
| 13062 | Use absolute imports instead of relative. |
| zmedico | |
svn path=/main/branches/prefix/; revision=13094
Fabian Groffen [Thu, 12 Mar 2009 19:18:52 +0000 (19:18 -0000)]
Merged from trunk -r12807:12824
| 12808 | Add more QA warnings for econf calls during unexpected |
| zmedico | phases. Thanks to Diego Elio Pettenò <flameeyes@g.o> for |
| | the suggestion. |
| 12809 | Only execute src_test pre/post hooks when src_test is |
| zmedico | actually executed. |
| 12810 | Bug #261670 - Generate a QA Notice if CHOST (from |
| zmedico | dyn_install) has a value which differs from the initial |
| | setting. |
| 12811 | Inside create_trees(), when cleansing the environment for |
| zmedico | the ROOT=/ config instance, call config.reset() so that |
| | configdict['env'] is cleared as was originally intended |
| | here. This prevents thinks like CHOST overrides from the |
| | calling environment from inappropriately being applied to |
| | ROOT=/. |
| 12812 | Simplify environment cleansing that's done for the ROOT=/ |
| zmedico | config instance when ROOT!=/. A new "env" config constructor |
| | parameter is used to allow the caller to avoid having the |
| | config instance polluted by os.environ. |
| 12813 | When the config_incrementals parameter is unspecified in the |
| zmedico | config constructor, don't warn because it's ridiculous to |
| | require this parameter when it's always the same anyway. |
| 12814 | Bug #261852 - If an unexpected exception is raise from |
| zmedico | emerge_main() then show the traceback after the mod_echo |
| | output to that the traceback isn't obscured by mod_echo |
| | flooding. |
| 12815 | Optimize dbapi._cpv_sort_ascending() by calling vercmp |
| zmedico | directly instead of calling pkgcmp. |
| 12816 | Initialize UserDict.data in the constructor. |
| zmedico | |
| 12817 | Simplify cmp_sort_key._cmp_key.__lt__(). |
| zmedico | |
| 12818 | Fix incorrect slice inside _src_uri_validate() and add new |
| zmedico | test case. |
| 12819 | Remove redundant conditional inside _src_uri_validate(). |
| zmedico | |
| 12820 | Make _src_uri_validate() identify the || operator as invalid |
| zmedico | and add a corresponding test case. |
| 12821 | Use protocol=2 for pickle.dump() calls, so that pickles |
| zmedico | written by py3k will be backward compatible. |
| 12822 | Handle ValueError and UnpicklingError inside |
| zmedico | PreservedLibsRegistry.load(). |
| 12823 | Use slices instead of startswith inside |
| zmedico | manifest2AuxfileFilter(). |
| 12824 | Don't default env=os.environ directly in the config |
| zmedico | constructor because that makes it show environment variables |
| | in api docs generated by epydoc. |
svn path=/main/branches/prefix/; revision=13093
Fabian Groffen [Mon, 9 Mar 2009 19:51:11 +0000 (19:51 -0000)]
Merged from trunk -r12790:12806
| 12791 | Also support + character in eclass names. |
| zmedico | |
| 12792 | Fix typo from previous commit. |
| zmedico | |
| 12793 | for pointers cast to 32bit ints, we always want to abort on |
| SpankMan | 64bit systems, not just when FEATURES=stricter |
| 12794 | Generate a QA Notice when EXPORT_FUNCTIONS is called before |
| zmedico | inherit, since it's incompatible with <=portage-2.1.6.7. |
| 12795 | Replace things like [[ $PORTAGE_BUILDDIR/.prepared -nt |
| zmedico | $WORKDIR ]] with simply [[ -e $PORTAGE_BUILDDIR/.prepared |
| | ]] since the timestamp of $WORKDIR is practically always |
| | newer due to the other hidden files that are created there |
| | as each phase is executed. Thanks to Alfredo Tupone |
| | <tupone@g.o> for reporting. |
| 12796 | Make the --digest warning message show for FEATURES=digest. |
| zmedico | |
| 12797 | Bug #261675 - When doebuild() is called by emerge, don't |
| zmedico | call digestgen() for FEATURES=digest because it's redundant |
| | and it can cause interference with parallel-fetch and |
| | parallel builds. |
| 12798 | Bug #261675 - Also don't call digestgen() from |
| zmedico | parallel-fetch processes. |
| 12799 | Bug #261675 - Generate manifests in advance when |
| zmedico | FEATURES=digest is enabled. |
| 12800 | Never call digestgen() inside doebuild() which only 'fetch' |
| zmedico | has been requested since it's not needed in this case. |
| 12801 | Reorganize code for --digests and FEATURES=digest. |
| zmedico | |
| 12802 | Make manifest mode with --force option cause existing |
| zmedico | digests to be replaced for any files that exist in |
| | ${DISTDIR}. This provides an alternative to ebuild --force |
| | manifest for updating existing distfiles digests. Digests |
| | are assumed to be corect for files that do not exist in |
| | ${DISTDIR} since the user could simply remove the whole |
| | Manifest if they wanted to regenerate digests for all files |
| | (and it's safer to regenerate as few as possible because |
| | it's less probably that a valid digest will get replaced by |
| | an invalid one). |
| 12803 | Fix _setitem() to account for the change to |
| zmedico | serialize_eclasses = False. |
| 12804 | Inside dyn_unpack(), only call pre/post phase hooks when |
| zmedico | src_unpack is called (when .unpacked does not already |
| | exist). |
| 12805 | Use the ebuild_phase helper function to calls phase hooks |
| zmedico | and fix broken trap calls that try to unset multiple signal |
| | handlers at once without passing - as the first argument. |
| 12806 | When generating variable names to hold EXPORT_FUNCTIONS |
| zmedico | argument in, use $ECLASS_DEPTH as a unique id since it's a |
| | lot simpler then encoding the eclass name in the variable |
| | name. |
svn path=/main/branches/prefix/; revision=12807
Fabian Groffen [Sun, 8 Mar 2009 21:11:24 +0000 (21:11 -0000)]
Merged from trunk -r12785:12788
| 12788 | Translate period characters in eclass names when generating |
| zmedico | variable names to store EXPORT_FUNCTIONS arguments. Thanks |
| | to Arfrever for reporting. |
svn path=/main/branches/prefix/; revision=12790
Fabian Groffen [Sun, 8 Mar 2009 21:09:37 +0000 (21:09 -0000)]
Merged from trunk -r12779:12785
| 12780 | In LazyItemsDict.__deepcopy__(), enable deepcopy of lazy |
| zmedico | items as it was before. This requires |
| | _LazyItem.__deepcopy__() to be overridden since the default |
| | implementation can fail silently, leaving some attributes |
| | unset. |
| 12781 | Implement _getitem instead of __getitem__ so that the base |
| zmedico | class __getitem__ implementation is used for _mtime_ and |
| | _eclasses_ handling. |
| 12782 | Make EXPORT_FUNCTIONS store it's arguments in an environment |
| zmedico | variable and perform the function generation after the |
| | current inherit call has returned. This way an eclass can |
| | call EXPORT_FUNCTIONS either before or after it inherits |
| | other eclasses, and the result is still the same. Thanks to |
| | Donnie Berkholz <dberkholz@g.o> for reporting. |
| 12783 | Fix PECLASS logic inside inherit() so that ECLASS is always |
| zmedico | restored to the correct value after recursion (previously it |
| | would be restored to the wrong value if more than one eclass |
| | was passed into the inherit call). |
| 12784 | Revert previous 2 commits due to bugs. |
| zmedico | |
| 12785 | Make EXPORT_FUNCTIONS store it's arguments in an environment |
| zmedico | variable and perform the function generation after the |
| | current inherit call has returned. This allows an eclass to |
| | call EXPORT_FUNCTIONS either before or after it inherits |
| | other eclasses, and the result is still the same. Thanks to |
| | Donnie Berkholz <dberkholz@g.o> for reporting. |
svn path=/main/branches/prefix/; revision=12789
Fabian Groffen [Sun, 8 Mar 2009 21:06:09 +0000 (21:06 -0000)]
Merged from trunk -r12771:12779
| 12772 | Fix LazyItemsDict.update() to create new _SingletonWrapper |
| zmedico | instances that reference self. |
| 12773 | Simplify LazyItemsDict internals. |
| zmedico | |
| 12774 | Allow unicode type values in config.__setitem__(). Thanks to |
| zmedico | Arfrever Frehtes Taifersar Arahesis for this patch. |
| 12775 | Always use basestring instead of str with isinstance(). |
| zmedico | |
| 12776 | Fix __getitem__ to convert mtime to long, and remove |
| zmedico | unreachable code from _parse_data(). |
| 12777 | Fix an issue with incomplete deepcopy of _LazyItem instances |
| zmedico | inside LazyItemsDict.__deepcopy__(). Thanks to Arfrever for |
| | reporting. |
| 12778 | Remove unnecessary list() from previous commit. |
| zmedico | |
| 12779 | Use slice instead of startwith in stack_* incremental |
| zmedico | processing. |
svn path=/main/branches/prefix/; revision=12787
Fabian Groffen [Sun, 8 Mar 2009 20:51:27 +0000 (20:51 -0000)]
Merged from trunk -r12764:12771
| 12765 | Fix failure exit status. Thanks to Brian Harring. |
| zmedico | |
| 12766 | whitespace cleanup |
| zmedico | |
| 12767 | Make digraph store a single priority list for each edge |
| zmedico | instead of two identical lists. |
| 12768 | Send message about unset RESUMECOMMAND to stderr instead of |
| zmedico | stdout. |
| 12769 | Define __slots__ for classes derived from ObjectProxy. |
| zmedico | |
| 12770 | Remove unused import. |
| zmedico | |
| 12771 | Add keyword argument support to LazyItemsDict.update(). |
| zmedico | |
svn path=/main/branches/prefix/; revision=12786
Fabian Groffen [Thu, 5 Mar 2009 19:01:49 +0000 (19:01 -0000)]
Merged from trunk -r12744:12760
| 12745 | Fix vdb entry writting code in dyn_install() to avoid |
| zmedico | generating empty entries in some cases. Thanks to Ned Ludd |
| | <solar@g.o> for reporting. |
| 12746 | Bug #256289 - When displaying an unsatisfied USE dep and all |
| zmedico | packages with the required IUSE are masked, show a normal |
| | "masked package" message for the package(s) that have the |
| | required IUSE (instead of showing the unmasked packages with |
| | missing IUSE). |
| 12747 | Bug #261082 - Fix --getbinpkgonly code in |
| zmedico | binarytree._populate() to update the aux_get cache when it's |
| | appropriate for a remote package to override a local |
| | package. |
| 12748 | Make glsa-check executable. |
| zmedico | |
| 12749 | Bug #261082 - Prefer remote package instances whenever |
| zmedico | --getbinpkg is enabled (previously local instances were |
| | preferred unless --getbinpkgonly was enabled). |
| 12750 | Remove unnecessary creation of lists when iterating over |
| zmedico | digraphs for --buildpkgonly hasallzeros check. |
| 12751 | Set Unpickler.find_global = None when possible and handle |
| zmedico | AttributeError for py3k. |
| 12752 | Make --version and action. |
| zmedico | |
| 12753 | Only generate PORTAGE_COUNTER_HASH for actions that can |
| zmedico | involve vdb modification. |
| 12754 | Make --searchdesc imply --search inside parse_opts(). |
| zmedico | |
| 12755 | Make the first argument of update() methods be an optional |
| zmedico | positional argument instead of a keyword argument. |
| 12756 | Remove unnecessary setting of default values to empty |
| zmedico | strings inside database._getitem(). |
| 12757 | Use basestring instead of str for isinstance check inside |
| zmedico | use_reduce() so that it works with unicode and remove |
| | related unicode to str workaround code from the sqlite cache |
| | module. |
| 12758 | Use enumerate() inside use_reduce() validation code. |
| zmedico | |
| 12759 | Add tests for use_reduce() and paren_reduce(). |
| zmedico | |
| 12760 | Make config.categories a sorted tuple so that portdbapi can |
| zmedico | reuse it. |
svn path=/main/branches/prefix/; revision=12764
Fabian Groffen [Thu, 5 Mar 2009 18:56:07 +0000 (18:56 -0000)]
Merged from trunk -r12715:12733
| 12716 | Fix a case in which a SRC_URI is incorrectly idendified as |
| zmedico | invalid, and add a corresponding test case. Thanks to Jacob |
| | Floyd for reporting. |
| 12717 | Fix test breakage due to change in calling order of |
| zmedico | AsynchronousTask start listeners from r12713. |
| 12718 | Add a new upstream.workaround check for hardcoded |
| zmedico | MAKEOPTS=-j1 (previously only emake -j1 was recognized). |
| | Thanks to Maciej Mrozowski <reavertm@poczta.fm> for this |
| | patch. |
| 12719 | Loosen EMakeParallelDisabled.re so it can match more |
| zmedico | variations. |
| 12720 | Fix PipeReader and PipeReaderTestCase to work with binary |
| zmedico | strings in py3k. |
| 12721 | Fix CommandOutputSet to decode binary command output in |
| zmedico | py3k. |
| 12722 | Use unicode() so that 2to3 handles py3k compatibility. |
| zmedico | |
| 12723 | Open the temp file in text mode for py3k compatibility. |
| zmedico | |
| 12724 | Open the temp file in text mode for py3k compatibility. |
| zmedico | |
| 12725 | Use os.fdopen() on file descriptors returned from mkstemp(). |
| zmedico | |
| 12726 | Open the temp file in text mode for py3k compatibility. |
| zmedico | |
| 12727 | Open the temp file in text mode for py3k compatibility. |
| zmedico | |
| 12728 | Open then temp file in text mode for py3k compatibility. |
| zmedico | |
| 12729 | Use Popen.communicate() to avoid a potential deadlock. |
| zmedico | |
| 12730 | Make Atom instances consume less memory by implementing str |
| zmedico | methods at the class level instead of referencing bound str |
| | methods. |
| 12731 | Add support to _ensure_default_encoding() for the same ascii |
| zmedico | and utf_8 aliases that encodings.aliases has. |
| 12732 | In _ensure_default_encoding(), make sure the default |
| zmedico | encoding is normalized. |
| 12733 | When checking ebuild content, use codecs.open() to force |
| zmedico | utf_8 encoding for py3k compatibility (all ebuilds should |
| | have utf_8 encoding). |
Merged from trunk -r12733:12744
| 12734 | Skip the code from bug #259954 when $ROOT != / since it |
| zmedico | shouldn't matter if there are unsatisfied system runtime |
| | deps in this case. |
| 12735 | * Fix portage.cache.template.database.__getitem__() to |
| zmedico | validate the _mtime_ field and raise a CacheCorruption |
| | exception if necessary. * Make _mtime_ and _eclasses_ |
| | validation code in portdbapi and mirror_cache() assume that |
| | these fields are the correct type (otherwise a |
| | CacheCorruption exeception should be raised earlier). * Fix |
| | the sqlite module to implement _getitem() so that it |
| | properly inherits __getitem__() _mtime_ and _eclasses_ |
| | handling. |
| 12736 | Remove redundant long(_mtime_) conversion since template |
| zmedico | handles it now. |
| 12737 | Thanks to Petteri Räty <betelgeuse@gentoo.org> for this new |
| zmedico | cache module which uses extended attributes (via pyxattr) to |
| | attach metadata cache directly to the ebuild files |
| | themselves. |
| 12738 | Don't give portage group write permissions on the mtimedb |
| zmedico | since it's not really needed. |
| 12739 | When fetch() is called and there is an existing file with |
| zmedico | the wrong size that is smaller than |
| | PORTAGE_FETCH_RESUME_MIN_SIZE, rename the file instead of |
| | deleting it. This is more friendly for cases in which the |
| | user is attempting to regenerate the digest but has not used |
| | `ebuild --force foo.ebuild manifest` like they're supposed |
| | to. Thanks to Patrick Lauer <patrick@g.o> for reporting. |
| 12740 | Use PORTAGE_USE when evaluating LICENSE inside |
| zmedico | portdbapi.gvisible(). |
| 12741 | When ACCEPT_CHOSTS is set, enable CHOST masking for unbuilt |
| zmedico | ebuilds. This behaves as a sanity check to protect people |
| | who are cross-compiling from accidentally merging an ebuild |
| | with CHOST set incorrectly. Thanks to Ned Ludd <solar@g.o> |
| | for reporting the problem. |
| 12742 | Fix KeyValuePairFileLoader to only split on '=' once and |
| zmedico | strip whitespace for keys and values. |
| 12743 | ACCEPT_CHOSTS applies to unbuilt ebuild now (not just binary |
| zmedico | packages). |
| 12744 | Make KeyValuePairFileLoader store the values as a strings |
| zmedico | instead of a lists. |
svn path=/main/branches/prefix/; revision=12763
Fabian Groffen [Thu, 5 Mar 2009 18:44:49 +0000 (18:44 -0000)]
Merged from trunk -r12704:12715
| 12705 | Bug #259882 - Disable the ignore-previously-merged option |
| zmedico | by default since emerge's confmem already provides similar |
| | functionality which is a little safer. |
| 12706 | In mirror_cache(), normalize EAPI by mapping EAPI=0 to |
| zmedico | empty. |
| 12707 | Implement lazy evaluation of USE_EXPAND variables in |
| zmedico | config.setcpv(), since those variables are only needed when |
| | an ebuild shell is spawned. Thanks to Marat Radchenko |
| | <slonopotamusorama@gmail.com> for testing this patch. He |
| | reports a 14% reduction in the time consumed for `emerge |
| | -vpe world` on an ARM device (from 3m12.008s to 2m45.055s). |
| 12708 | Fix typo in DepPriority.__str__(). |
| zmedico | |
| 12709 | Implement BlockerDepPriority.__str__(). |
| zmedico | |
| 12710 | Inside depgraph._merge_order_bias(), promote deep system |
| zmedico | runtime deps toward the front of the merge list. This |
| | should help optimize merge order to account for implicit |
| | system dependencies. |
| 12711 | Remove stray parenthesis. |
| zmedico | |
| 12712 | reject all set*id binaries that have DT_RPATH:$ORIGIN |
| SpankMan | #260331 |
| 12713 | Bug #259954 - Do not spawn parallel build when the system |
| zmedico | is in a fragile state due to a system package having an |
| | unsatisfied runtime dependency (such as sys-libs/pam having |
| | an unsatisfied PDEPEND on sys-auth/pambase). |
| 12714 | In traversing deps to add to |
| zmedico | Scheduler._unsatisfied_system_deps, only traverse completed |
| | 'merge' nodes since those are the only ones that need to be |
| | checked for unsatisfied runtime deps, and it's normal for |
| | nodes that aren't yet complete to have unsatisfied runtime |
| | deps. |
| 12715 | Remove recursion code from |
| zmedico | Scheduler._system_merge_started() since indirect deps are |
| | checked when the corresponding parent is merged. |
svn path=/main/branches/prefix/; revision=12762
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
projects / portage.git / log