Fabian Groffen [Thu, 27 Dec 2007 19:48:54 +0000 (19:48 -0000)]
Merged from trunk 9049:9056
| 9050 | - small UI cleanups. *should* not cause problems with lack |
| solar | of missing newlines. |
| 9051 | Bug #203239 - With FEATURES=noauto, always source ${EBUILD}. |
| zmedico | This will load the ${T}/environment file if available and |
| | then source ${EBUILD} to overwrite any functions that have |
| | changed. |
| 9052 | Bug #203090 - Do not trust the global counter file that can |
| zmedico | lead to invalid COUNTER generation. |
| 9053 | Fix "Initializing counter" message to show the correct |
| zmedico | value. |
| 9054 | In getconfig(), pass the infile attribute into the shlex |
| zmedico | constructor so that shlex.sourcehook() properly joins |
| | relative paths. |
| 9055 | Fix sync_local() to return 0 when a appropriate. Thanks to |
| zmedico | Alon Bar-Lev" <alonbl@gentoo.org> |
| 9056 | Fix broken handling of the tuple that's returned from |
| zmedico | verify_all(). Thanks to Betelgeuse. |
svn path=/main/branches/prefix/; revision=9058
Fabian Groffen [Thu, 27 Dec 2007 19:41:40 +0000 (19:41 -0000)]
properly end the string such that we don't get garbage in symlinks
svn path=/main/branches/prefix/; revision=9057
Fabian Groffen [Mon, 24 Dec 2007 13:57:12 +0000 (13:57 -0000)]
Python doesn't like imports after references ... even if the import was already done in global scope
svn path=/main/branches/prefix/; revision=9049
Fabian Groffen [Mon, 24 Dec 2007 13:42:43 +0000 (13:42 -0000)]
fix import logic, to hopefully not break this time
svn path=/main/branches/prefix/; revision=9048
Fabian Groffen [Mon, 24 Dec 2007 13:13:52 +0000 (13:13 -0000)]
Merged from trunk 9045:9046
| 9046 | Remove redundant find_binary import. |
| zmedico | |
svn path=/main/branches/prefix/; revision=9047
Fabian Groffen [Sat, 22 Dec 2007 23:07:33 +0000 (23:07 -0000)]
Portage module path logic (Prefix way)
In principle we don't want to be dependant on the environment
(PYTHONPATH) and/or python hardcoded default search path. (PYTHONPATH).
Since Gentoo patches Python to include Portage's python modules in the
default search path, any Gentoo python interpreter is an enemy for
Portage once it is not installed in the path hardcoded during Python
compilation. This is the case when bootstrapping Prefix Portage on a
Gentoo Linux system, or when bootstrapping Prefix Portage using another
Prefix instance on the same system. For this reason we ignore the
entire search path, and allow a backdoor for developers via the
PORTAGE_PYTHONPATH variable.
svn path=/main/branches/prefix/; revision=9045
Fabian Groffen [Sat, 22 Dec 2007 13:45:14 +0000 (13:45 -0000)]
Make sure EPREFIX is stored in xpak as a file for binary packages. Patch from zmedico via pipping.
svn path=/main/branches/prefix/; revision=9044
Fabian Groffen [Sat, 22 Dec 2007 13:34:00 +0000 (13:34 -0000)]
Fix regression I introduced in r9041
svn path=/main/branches/prefix/; revision=9043
Fabian Groffen [Sat, 22 Dec 2007 13:31:17 +0000 (13:31 -0000)]
Merged from trunk 9029:9038
| 9031 | Make vardbapi cache DESCRIPTION and HOMEPAGE in order to |
| zmedico | optimize emerge --searchdesc. |
| 9033 | Enhance the portageq match command to list all installed |
| zmedico | packages when given an empty string. |
| 9034 | Typo: remove bogus argument. |
| zmedico | |
| 9035 | Implement a `portageq contents ` command that lists all the |
| zmedico | files that are installed for a given package, with one file |
| | listed on each line. |
| 9038 | Add support for --usepkg and --usepkgonly options together |
| zmedico | with emerge --search. |
svn path=/main/branches/prefix/; revision=9042
Fabian Groffen [Sat, 22 Dec 2007 13:29:47 +0000 (13:29 -0000)]
Merged from trunk 9001:9029
| 9002 | Hardcode #!/bin/bash for consistency with other scripts. |
| zmedico | |
| 9004 | Bug #202566 - Move the 'global portage' statement to avoid |
| zmedico | "SyntaxWarning: name 'portage' is assigned to before global |
| | declaration" messages produced by earlier python-2.4. |
| 9005 | Fix a reference to an undefined "mykey" variable. |
| zmedico | |
| 9006 | Slightly improved the masked package check inside |
| zmedico | dep_zapdeps(). |
| 9008 | Add "metadata" and "licenses" to _non_category_dirs. |
| zmedico | |
| 9010 | Use a regex to validate package directory names in |
| zmedico | portdbapi.cp_list() and also simplify the catagory regex a |
| | bit. |
| 9012 | Use regex category validation in binarytree.populate(). |
| zmedico | |
| 9013 | Fix references to dbapi._category_re. |
| zmedico | |
| 9015 | Tweak profile validation and warning logic a bit. |
| zmedico | |
| 9016 | In portage.spawn(), make the default fd_pipes value get file |
| zmedico | descriptors from sys.std{in,out,err} so that they can be |
| | overridden. |
| 9018 | In portage.process.spawn(), make the default fd_pipes value |
| zmedico | get file descriptors from sys.std{in,out,err} so that they |
| | can be overridden. |
| 9020 | Fix xmatch "match-all" typo. |
| zmedico | |
| 9023 | Eliminate redundant "notadded" error filtering. |
| zmedico | |
| 9025 | Make the "test" flag that's enabled by FEATURES=test into an |
| zmedico | implicit iuse member. |
| 9027 | Implement emerge --search support for installed packages, so |
| zmedico | it works even without a portage tree or binary packages. |
| 9028 | Don't show "Size of files: 0 kB" in emerge --search output |
| zmedico | for installed packages that have no available ebuild in the |
| | tree. |
| 9029 | Implement binary package visibility filtering for emerge |
| zmedico | --search. |
svn path=/main/branches/prefix/; revision=9041
Fabian Groffen [Sat, 22 Dec 2007 13:21:21 +0000 (13:21 -0000)]
Fix copy and paste error as pointed out by pipping
svn path=/main/branches/prefix/; revision=9040
Fabian Groffen [Thu, 20 Dec 2007 18:35:39 +0000 (18:35 -0000)]
Merged from trunk 8968:8997
| 8969 | Whitespace only: remove extra indentation. |
| zmedico | |
| 8971 | Bug #202748 - When merging a binary package, only clean up |
| zmedico | temp files on success. Otherwise, leave the temp files |
| | intact for debugging purposes. |
| 8973 | Make some adjustments so that it's possible to install |
| zmedico | binary packages without having a portage tree: * Make |
| | portdbapi.aux_get() return early by raising a KeyError if it |
| | detects that there is no portage tree. * Move the ARCH and |
| | USERLAND sanity check to the last moment in doebuild() and |
| | only require these variables if an existing environment |
| | (such as environment.bz2) is unavailable. * Make the |
| | NewsManager constructor cope with a broken make.profile |
| | symlink. |
| 8974 | Convert messages about missing portage tree to debug level |
| zmedico | warnings since quite often it's possible to function without |
| | a portage tree now. |
| 8975 | Make binarytree.populate() stop relying on having a |
| zmedico | categories list since it may not be available if there is no |
| | portage tree. |
| 8976 | Pass a valid phase into eerror so that it works. |
| zmedico | |
| 8978 | Fix a type: eclasses -> eclass. |
| zmedico | |
| 8980 | Enable emerge search actions for binary packages when there |
| zmedico | is no portage tree available. |
| 8982 | Make vartree.cpv_all() stop relying on having a categories |
| zmedico | list since it may not be available if there is no portage |
| | tree. |
| 8985 | Fix binarytree._update_pkgindex_header() so that it can cope |
| zmedico | with a missing profile. |
| 8988 | Make dep_zapdeps() fall back to installed packages in it's |
| zmedico | availability test in cases where the package does not appear |
| | to be masked. This solves dep selection preference issues |
| | when working without a portage tree. |
| 8990 | Fix portdbapi.cp_list() so that it can cope with a missing |
| zmedico | profile. |
| 8992 | For simplicity and consistency, always use a regular |
| zmedico | expression for category validation instead of using a list. |
| 8993 | Filter out some non-category directories in |
| zmedico | portdbapi.cp_all(). |
| 8997 | Fix a typo in the _non_category_dirs regex. |
| zmedico | |
svn path=/main/branches/prefix/; revision=9001
Fabian Groffen [Thu, 20 Dec 2007 18:32:15 +0000 (18:32 -0000)]
Merged from trunk 8941:8967
| 8942 | Generalize the sed -> gsed wrapper script so that it's |
| zmedico | possible to create awk, make, and patch symlinks that behave |
| | analogously. These symlinks will make it unnecessary for |
| | default-bsd profiles to define profile.bashrc aliases for |
| | these commands. |
| 8943 | Fix typo: %% -> ##. |
| zmedico | |
| 8944 | Bug #176467 - Filter out USE flags that aren't part of IUSE. |
| zmedico | Some flags are considered to be implicit members of IUSE: * |
| | Flags derived from ARCH * Flags derived from |
| | USE_EXPAND_HIDDEN variables * Forced flags, such as those |
| | from {,package}use.force |
| 8945 | Create a PORTAGE_IUSE variable containing an egrep pattern |
| zmedico | for use by the QA check that's built into useq(). This |
| | allows the IUSE logic for this check to be isolated in the |
| | python code. |
| 8949 | Include masked flags in PORTAGE_IUSE to avoid more false |
| zmedico | positives in the useq() IUSE check. |
| 8951 | Only enable the PORTAGE_IUSE check during build time phases |
| zmedico | since that's the only time it's valid for now. |
| 8953 | Display the merge list with blockers any time that there are |
| zmedico | blockers, instead of telling the user to try again with |
| | --pretend. |
| 8955 | Make special build and bootstrap flags into implicit members |
| zmedico | of IUSE so that stage builds will work again. |
| 8957 | Fix USE filtering code so that it doesn't rely on |
| zmedico | config.setcpv() calling config.regenerate(). |
| 8959 | Store filtered USE for config.environ() calls in a special |
| zmedico | attribute so that the normal global USE is still available |
| | for things like emerge --info output. |
| 8961 | Trigger a config.regenerate() call inside setcpv() when the |
| zmedico | EBUILD_PHASE variable is defined. It's too expensive to do |
| | the regenerate() call every time. Do in when EBUILD_PHASE is |
| | defined since it's needed to create the filtered USE that |
| | environ() passes to the ebuild environment. |
| 8963 | Keep filtered USE in the PORTAGE_USE variable to keep it |
| zmedico | separate from the global USE that's shown by emerge --info. |
| 8965 | Bug #140180 - Ignore missing HOMEPAGE and LICENSE variables |
| zmedico | for new-style virtual packages. |
| 8967 | Always add ARCH to USE without relying on it being listed in |
| zmedico | PORTAGE_ARCHLIST. |
svn path=/main/branches/prefix/; revision=9000
Fabian Groffen [Mon, 17 Dec 2007 18:35:50 +0000 (18:35 -0000)]
I probably got somehow annoyed by the ${D} in the output in the past
here. However, since zmedico solved it using a sed, remove my bash
version of it to be more in sync with the trunk.
svn path=/main/branches/prefix/; revision=8941
Fabian Groffen [Mon, 17 Dec 2007 18:28:23 +0000 (18:28 -0000)]
Merged from trunk 8900:8937
| 8901 | Make portdbapi.visible() mask ebuilds that do not define |
| zmedico | SLOT. (branches/2.1.2 r8900) |
| 8904 | Use the BAD color class instead of hardcoded red. |
| zmedico | |
| 8906 | Properly filter SANDBOX_ON from the environment. When |
| zmedico | sourcing ${T}/environment it's a bit tricky because we have |
| | to temporarily disable sandbox since the |
| | SANDBOX_{DENY,READ,PREDICT,_WRITE} values we've just loaded |
| | may be unusable (triggering in spurious sandbox violations) |
| | until we've merged them with our current values. |
| 8907 | Remove extra _ typo. |
| zmedico | |
| 8909 | Allow FEATURES to persist between phases since the user |
| zmedico | might want to modify it via bashrc to enable things like |
| | splitdebug and installsources for specific packages. They |
| | should be able to modify it in pre_pkg_setup() and have it |
| | persist all the way through the install phase. However, if |
| | FEATURES exist inside environment.bz2 then they should be |
| | overridden by current settings. |
| 8911 | Make sure that PORTAGE_SANDBOX_* variables can never be set |
| zmedico | by "${T}"/environment. |
| 8913 | Bug #202126 - Replace an obsolete reference to `emerge |
| zmedico | --help config` with a reference to the CONFIGURATION FILES |
| | section of emerge(1). |
| 8915 | Disable the "QA Notice: Pre-stripped files" message when |
| zmedico | RESTRICT contains "strip" or "binchecks". This is needed at |
| | least for the glibc ebuild since it calls prepallstrip |
| | directly, resulting in it being called twice. Thanks to |
| | loki_val for reporting. |
| 8917 | Add --buildpkgonly to the options lists that exempt from |
| zmedico | slot collisions and world file updates. |
| 8920 | Add support for multi-line commit message input by using EOF |
| zmedico | as a delimiter (Ctrl-d) instead of a new line. |
| 8921 | Add support for getting a commit message using an editor |
| zmedico | defined by the EDITOR environment variable. |
| 8923 | Prompt the user before letting the editor take over the |
| zmedico | screen so there is an opportunity to review any QA warnings. |
| 8925 | Save QA output so that it can be conveniently displayed in |
| zmedico | $EDITOR while the user creates a commit message. Otherwise, |
| | the user would not be able to see this output once the |
| | editor has taken over the screen. Output is done through a |
| | formatter object where it is captured for later use. A |
| | file-like object that behaves something like the |
| | portage.output.colorize() function is used to transfor style |
| | identifiers from the formatter framework into actual console |
| | codes. |
| 8927 | Replace hardcoded green, yellow, and red with GOOD, WARN, |
| zmedico | and BAD. |
| 8928 | Instead of all modes, only in commit mode save an extra copy |
| zmedico | of QA output for display in $EDITOR. |
| 8930 | Split out a format_qa_output() function to eliminate |
| zmedico | duplicate code. |
| 8932 | Fix punctuation and spelling. Thanks to Arfrever Frehtes |
| zmedico | Taifersar Arahesis <arfrever.fta@gmail.com>. |
| 8934 | Move the reusable ConsoleStyleFile and StyleWriter classes |
| zmedico | into the ouput module. |
| 8935 | In "QA Notice: Precompiled python" messages, use sed to |
| zmedico | strip the leading ${D} from file paths. |
| 8937 | Fix setconfig.getSets() api breakage. |
| zmedico | |
svn path=/main/branches/prefix/; revision=8940
Fabian Groffen [Mon, 17 Dec 2007 18:14:25 +0000 (18:14 -0000)]
merge from trunk r8897 and fix up for SVN support
svn path=/main/branches/prefix/; revision=8939
Fabian Groffen [Mon, 17 Dec 2007 18:02:15 +0000 (18:02 -0000)]
Merged from trunk 8873:8896
| 8874 | Do an EBUILD_EXIT_STATUS_FILE sanity check in spawnebuild() |
| zmedico | where it spawns misc-functions.sh after the install phase. |
| 8876 | Add some documentation for ebuild phases and pre/post phase |
| zmedico | hooks that can be defined via bashrc. |
| 8877 | Add a "Quality Assurance" tag so that all chapters are |
| zmedico | consistently nested inside tags. |
| 8878 | * When installing a binary package, export the file name of |
| zmedico | the package as PORTAGE_BINPKG_FILE in order to give bashrc |
| | users an opportunity to do various things such as remove |
| | binary packages after they're installed. * Add a note in |
| | ebuild.sh explaining why hardcoded bash lists are needed for |
| | backward compatibility with <portage-2.1.4 since they assume |
| | that a newly installed version of ebuild.sh will work for |
| | pkg_postinst, pkg_prerm, and pkg_postrm when portage is |
| | upgrading itself. |
| 8882 | First import the main portage module without legacy globals |
| zmedico | since it is almost certain to succeed in that case. This |
| | provides access to the portage.exception namespace which is |
| | needed for later exception handling, like if |
| | portage.exception.PermissionDenied is raised when |
| | constructing the legacy global config instance. |
| 8883 | * Raise PermissionDenied from getconfig() when appropriate. |
| zmedico | * When available, make getconfig() include an invalid token |
| | in a ParseError message. |
| 8884 | Instead of calling sys.exit when a ParseError occurs in the |
| zmedico | config constructor, raise a ParseError and make emerge and |
| | portageq handle the error. This way consumers of the portage |
| | api can handle the ParseError rather than have their |
| | application exit. Thanks to lxnay for reporting. |
| 8887 | Bug #198398 - Make repoman bail out if support for RMD160 |
| zmedico | hash creation appears to be missing. |
| 8888 | Fix the check for bug #198398 so that it works even when |
| zmedico | running repoman from the root of the repo. |
| 8889 | Bug #202036 - In case of blockers, bail out earlier so that |
| zmedico | later code can assume there are no blockers. |
| 8891 | In filter_readonly_variables(), replace 'declare -r ' with |
| zmedico | 'declare ' instead of removing it completely. |
| 8892 | Bug #202068 - In order to filter unwanted variable |
| zmedico | assignments out of the bash environment, use a |
| | filter-bash-environment.py script that behaves similar to |
| | egrep -v except that it leaves bash here- documents intact. |
| 8893 | Use the sed -r option to enable extended regular expressions |
| zmedico | so that commonly used characters like (, ), and + don't have |
| | to be escaped. |
| 8894 | Bug #201848 - Mask ebuilds that do not define SLOT. |
| zmedico | |
| 8895 | Bug #201848 - Make the ebuild command reject ebuilds that do |
| zmedico | not define SLOT. |
| 8896 | Bug #201771 - Make unpack() detect common errors such as |
| zmedico | absolute paths that start with ${DISTDIR} and die an |
| | appropriate error message. Thanks to grobian for this patch. |
svn path=/main/branches/prefix/; revision=8938
Fabian Groffen [Sat, 8 Dec 2007 17:34:45 +0000 (17:34 -0000)]
ED is readonly
svn path=/main/branches/prefix/; revision=8872
Fabian Groffen [Sat, 8 Dec 2007 17:27:09 +0000 (17:27 -0000)]
Don't forget PORTAGE_USER and PORTAGE_GROUP as Prefix additions
svn path=/main/branches/prefix/; revision=8871
Fabian Groffen [Sat, 8 Dec 2007 16:47:08 +0000 (16:47 -0000)]
Make portage work in Prefix again by whitelisting the Prefix special
variables.
svn path=/main/branches/prefix/; revision=8870
Fabian Groffen [Sat, 8 Dec 2007 16:28:14 +0000 (16:28 -0000)]
Merged from trunk 8843:8867
| 8844 | In order to know exactly which atoms/sets should be added to |
| zmedico | the world file, the depgraph performs set expansion later. |
| | It will get confused about where the atoms came from if it's |
| | not allowed to expand them itself. |
| 8845 | bootstrap.sh expects that the "system" set always exists, so |
| zmedico | create it automatically if necessary. |
| 8846 | Show ? if the installed package is missing a repository |
| zmedico | label. The stable version of portage creates these labels |
| | now, so false positives won't be as common as they used to |
| | be. |
| 8848 | - repository configuration file and `emerge --sync |
| zmedico | [repo_set]... [repo]...` support for overlays and binhosts |
| | (zmedico) |
| 8849 | Make SetConfig.getSets() return a copy of the psets |
| zmedico | attribute instead of a direct reference. Fix the to stop |
| | relying on having the direct reference. |
| 8850 | Keep the RootConfig.sets attribute in sync with the |
| zmedico | SetConfig. |
| 8851 | Fix broken timestamp logic in do_snapshot(). Thanks to Alon |
| zmedico | Bar-Lev <alonbl@gentoo.org> for this patch. |
| 8852 | Remove redundant successful exit call from the "depend" |
| zmedico | phase and let it run to the bottom of ebuild.sh just like |
| | the other phases. |
| 8853 | Bug #201506 - Make preprocess_ebuild_env() preserve |
| zmedico | SANDBOX_{DENY,PREDICT,READ,WRITE} between all phases, except |
| | when the environment comes directly from environment.bz2. |
| 8857 | Prevent the filter_opts local variable from leaking into the |
| zmedico | environment in preprocess_ebuild_env(). |
| 8859 | Declare retval as a local variable. |
| zmedico | |
| 8861 | Bug #201513 - Fix typos for preserve-libs and |
| zmedico | PreservedLibraryConsumerSet. Thanks to Arfrever Frehtes |
| | Taifersar Arahesis <Arfrever.FTA@GMail.Com> for this patch. |
| 8862 | Remove automatic "system" and "world" set creation since we |
| zmedico | can probably rely on having a complete config. |
| 8863 | Perform set argument validation in emerge_main() even for |
| zmedico | values actions that need to expland sets themselves. |
| 8864 | Add a TODO note about remaining work for bug #189417. |
| zmedico | |
| 8865 | Bug #189417 - Explicitly whitelist any remaining variables |
| zmedico | that are allowed to leak into the ebuild environment. Also, |
| | fix spawnebuild to properly filter the env when it spawns |
| | misc-functions.sh after the install phase. There is still |
| | some remaining leakage that seems to come from something in |
| | the ebuild environment sourcing /etc/profile. |
| 8866 | Bug #189417 - Whitelist BASH_ENV since we need to have it |
| zmedico | set in order to prevent sandbox from causing env leakage by |
| | sourcing /etc/profile via it's bashrc. |
| 8867 | Bug #189417 - Comment on how the whitelist and BASH_ENV are |
| zmedico | used to prevent environment leakage. |
svn path=/main/branches/prefix/; revision=8869
Fabian Groffen [Tue, 4 Dec 2007 20:35:07 +0000 (20:35 -0000)]
The sets.conf file is expected one level deeper. Having it there might
make Portage functional again ;)
svn path=/main/branches/prefix/; revision=8843
Fabian Groffen [Tue, 4 Dec 2007 20:09:57 +0000 (20:09 -0000)]
Merged from trunk 8820:8841
| 8821 | implement the final part of FEATURES=preserved-libs and |
| genone | remove previously preserved libs that don't have any |
| | consumers left. Also fix the notice if preserved libs are |
| | found to use the preserved-rebuild package set instead of |
| | revdep-rebuild. |
| 8822 | Bug #201082 - Don't call config.load_infodir() prior to |
| zmedico | pkg_postinst() because it's not needed and the ebuild path |
| | that's passed in for postinst is may be from the portage |
| | tree, which causes load_infodir() to discard critical |
| | metadata such as CATEGORY without realoading it. |
| 8824 | revert accidential commit |
| genone | |
| 8825 | update TODO list |
| genone | |
| 8826 | Make config.load_infodir() more fault tolerant for cases |
| zmedico | like bug #201082. |
| 8828 | Bug #201090 - When portage creates a temp PORTAGE_BIN_PATH, |
| zmedico | put it inside PORTAGE_TMPDIR since, unlike /tmp, it can't be |
| | mounted with the "noexec" option. |
| 8830 | * Don't load the CATEGORY in config.load_infodir() since |
| zmedico | this value is critical for doebuild() operation and we |
| | already know the category. * Always call config.setcpv() |
| | prior to config.load_infodir() so that the CATEGORY is |
| | always known. |
| 8831 | Fix typo in config.load_infodir() return value logic. |
| zmedico | |
| 8833 | Synchronize the conditional that triggers "${T}"/environment |
| zmedico | generation with the conditional that triggers distcc and |
| | ccache FEATURES setup. |
| 8835 | Remove redundant config.load_infodir() calls from |
| zmedico | portage.pkgmerge() and dblink.unmerge() since it's already |
| | called in doebuild.() |
| 8837 | make sure we only remove files that were previously |
| genone | preserved |
| 8838 | enable FEATURES=preserve-libs globally for extended testing |
| genone | |
| 8839 | Fix setconfig loader to use config files instead of |
| genone | hardcoded fallbacks |
| 8840 | perform sanity checks for set configuration even if myaction |
| genone | is None |
| 8841 | fix another typo |
| genone | |
svn path=/main/branches/prefix/; revision=8842
Fabian Groffen [Mon, 3 Dec 2007 17:52:42 +0000 (17:52 -0000)]
Merged from trunk 8815:8818
| 8816 | For compatibility with cvs.eclass, do not unset CVS_RSH in |
| zmedico | save_ebuild_env() since that variable may be initialized in |
| | global scope. |
| 8818 | * whitelist CCACHE_* and DISTCC_* variables in |
| zmedico | config.environ() * unset CCACHE_* and DISTCC_* variables in |
| | save_ebuild_env() |
svn path=/main/branches/prefix/; revision=8820
Fabian Groffen [Sun, 2 Dec 2007 21:59:55 +0000 (21:59 -0000)]
tabcheck complains about my tabbing... fix it
svn path=/main/branches/prefix/; revision=8815
Fabian Groffen [Sun, 2 Dec 2007 21:50:41 +0000 (21:50 -0000)]
Merged from trunk 8781:8808
| 8783 | When die has been called and ${T}/environment does not |
| zmedico | exist, dump the current environment to ${T}/die.env in case |
| | it helps for debugging. |
| 8785 | In create_trees(), when isolating the environment of the |
| zmedico | ROOT=/ config, use it's env.d keys as a blacklist to make |
| | env.d override the calling environment. |
| 8787 | Add missing newline after message. |
| zmedico | |
| 8789 | Move duplicate module loading code into a function. |
| zmedico | |
| 8791 | After each merge, collect status from child processes in |
| zmedico | order to clean up zombies (such as the parallel-fetch |
| | process). |
| 8792 | When os.waitid() raises OSError, discard the pid since |
| zmedico | there's no need to wait on it again. |
| 8794 | Show the pid in the "starting parallel fetching" message. |
| zmedico | |
| 8796 | * whitelist some misc variables from the calling environment |
| zmedico | * blacklist the same variables in save_ebuild_env() so that |
| | the latest values from the calling environment always |
| | override those from the ebuild environment |
| 8798 | For portage.spawn() calls, use a _shell_quote() function to |
| zmedico | quote the path of the binary since. |
| 8801 | In dblink.treewalk(), tweak the "Safely unmerging |
| zmedico | already-installed instance" logic to make sure that it works |
| | in all possible cases. |
| 8803 | Synchronize self-reinstallation logic so that emerge will |
| zmedico | always restart itself when dblink.merge() creates temporary |
| | copies of PORTAGE_{BIN,PYM}_PATH. |
| 8805 | Fix useq() so that it won't generate a bogus IUSE QA Notice |
| zmedico | if called during the "depend" phase with a flag that uses |
| | IUSE defaults. |
| 8807 | Add back missing err() function. |
| zmedico | |
| 8808 | Convert caterror() to call warn() instead of err() since we |
| zmedico | don't want to exit here. |
svn path=/main/branches/prefix/; revision=8814
Fabian Groffen [Sun, 2 Dec 2007 21:32:12 +0000 (21:32 -0000)]
Merged from trunk 8754:8781
| 8755 | Remove unused EBUILD_ENV_FILE variable. |
| zmedico | |
| 8757 | * After the initial setup phase, the original ebuild and |
| zmedico | eclasses are no longer needed because the same ebuild |
| | environment is reused for the entire lifecycle of the |
| | package, including uninstallation. |
| 8759 | Make config.environ() export PKGDIR to the ebuild |
| zmedico | environment during the "package" phase since it's currently |
| | referenced there. |
| 8761 | Don't use sandbox's BASH_ENV for new shells because it does |
| zmedico | 'source /etc/profile' which can interfere with the build |
| | environment by modifying our PATH. |
| 8763 | Add some variables such as TERM to the whitelist of |
| zmedico | variables from the calling environment that are allowed into |
| | the ebuild environment. |
| 8765 | Bug #200775 - Save more portage generated environment |
| zmedico | variables that are in environment.bz2 so that they are |
| | available for use by tools such as epm. |
| 8768 | sandbox unsets ROOTPATH, so we have to back it up on the |
| zmedico | python side then restore it on the bash side. |
| 8770 | Bug #200863 - Don't filter ${KV} since kernel-2.eclass uses |
| zmedico | that variable and we don't want to interfere. |
| 8771 | In doebuild_environment(), fix KV logic so that it never |
| zmedico | gets set during the "depend" phase. Also, use |
| | backup_changes() to properly cache the result. |
| 8774 | Fix quoting for PORTAGE_ROOTPATH. |
| zmedico | |
| 8776 | Update comments about ROOTPATH: sandbox's bashrc sources |
| zmedico | /etc/profile which unsets ROOTPATH, so we have to back it up |
| | and restore it. |
| 8777 | Update comments about ROOTPATH: sandbox's bashrc sources |
| zmedico | /etc/profile which unsets ROOTPATH, so we have to back it up |
| | and restore it |
| 8779 | * whitelist DISTDIR, PORTDIR, and PORTAGE_TMPDIR, |
| zmedico | PORTAGE_WORKDIR_MODE. * whitelist RPMDIR just for the "rpm" |
| | phase. |
| 8781 | * whitelist PREROOTPATH in config.environ() * filter |
| zmedico | PREROOTPATH in save_ebuild_env() |
svn path=/main/branches/prefix/; revision=8813
Fabian Groffen [Sun, 2 Dec 2007 21:29:30 +0000 (21:29 -0000)]
Merged from trunk 8729:8754
| 8731 | If portage is reinstalling itself, create a temporary copy |
| zmedico | of PORTAGE_BIN_PATH in order to avoid relying on on the new |
| | versions which may be incompatible. |
| 8732 | Enable the EBUILD_EXIT_STATUS_FILE sanity check when portage |
| zmedico | is reinstalling itself since the check is reliable in this |
| | case now that a temporary PORTAGE_BIN_PATH is created. |
| 8733 | Fix references to PORTAGE_BIN_PATH in doebuild() to use the |
| zmedico | config setting since it may be a temp directory when portage |
| | is reinstalling itself. |
| 8734 | In doebuild, fix paths to ebuild.sh and misc-functions.sh so |
| zmedico | that they work with variable PORTAGE_BIN_PATH. |
| 8735 | Fix more references to MISC_SH_BINARY so that they work |
| zmedico | properly with variable PORTAGE_BIN_PATH. |
| 8736 | Fix a typo. |
| zmedico | |
| 8737 | Make dblink.treewalk() properly delete the installed |
| zmedico | instance after it unmerges it. |
| 8738 | Fix references to EBUILD_SH_BINARY so that they work |
| zmedico | properly with variable PORTAGE_BIN_PATH. |
| 8739 | Remove stray print statement. |
| zmedico | |
| 8741 | In dblink.treewalk(), make portage unmerge multiple |
| zmedico | instances os sys-apps/portage in the same slot if necessary |
| | (needed when AUTOCLEAN=no is set). |
| 8743 | When portage reinstalls itself, copy both the bin and pym |
| zmedico | directories to a temp dir. Insert the temporary |
| | PORTAGE_PYM_PATH as the first element of sys.path and |
| | register an atexit hook to clean up the temporary |
| | directories. |
| 8745 | Adjust PYTHONPATH when calling portageq so that variable |
| zmedico | PORTAGE_PYM_PATH works. |
| 8747 | Don't modify sys.path inside dblink.merge() because it |
| zmedico | doesn't seem to help and it triggers import errors for elog |
| | modules when downgrading to versions of portage that use the |
| | old namespace. |
| 8749 | When portage reinstalls itself, pre-load elog modules in |
| zmedico | dblink.merge() since we won't be able to later if they get |
| | unmerged (happens when namespace changes). |
| 8751 | Make elog_process() pre-load log modules that it can be |
| zmedico | called just for that purpose. |
| 8753 | Move environment.bz2 extraction from ebuild.sh to doebuild() |
| zmedico | on the python side. The python will be able to use it's |
| | awareness of the ${T}/environment to decide what type of |
| | ebuild environment should be generated. For example, if the |
| | ebuild environment should be able to unset variables that |
| | have been inherited from the calling environment, the |
| | existence of ${T}/environment will indicate that the ebuild |
| | environment should be isolated from the calling environment. |
| 8754 | Bug #189417 - When ${T}/environment exists, isolate the |
| zmedico | ebuild environment from the calling environment. This makes |
| | it possible for the build to unset a variable that was |
| | inherited from the calling environment, and the variable |
| | will remain unset between phases. |
svn path=/main/branches/prefix/; revision=8812
Fabian Groffen [Sun, 2 Dec 2007 21:28:02 +0000 (21:28 -0000)]
Merged from trunk 8696:8729
| 8698 | Make doebuild() use EBUILD_EXIT_STATUS_FILE sanity checks |
| zmedico | for the extra misc-functions.sh preinst/postinst shell code. |
| 8700 | Make the environment handling code detect errors and die if |
| zmedico | necessary. |
| 8702 | Bug #200231 - Make dir_get_metadata() handle an exception |
| zmedico | thrown from dir_get_list() when there's a problem connection |
| | problem. |
| 8704 | Fix config.pop() so that is will properly raise a KeyError. |
| zmedico | |
| 8706 | Don't forget to unlink ${EBUILD_EXIT_STATUS_FILE} before |
| zmedico | each phase. |
| 8708 | Bug #200229 - The gimp ebuild defines AA as a local |
| zmedico | variable. In order to accomodate this, create a |
| | PORTAGE_MUTABLE_FILTERED_VARS list for variables that |
| | portage sets but doesn't mark readonly. In order to prevent |
| | changed values from causing unexpcted interference, they are |
| | filtered out of the environment when it is saved or loaded |
| | (any mutations do not persist). |
| 8710 | Fix logic wrt exit_status_check and elog_process in |
| zmedico | doebuild(). |
| 8712 | Remove a redundant os.EX_OK check that exit_status_check() |
| zmedico | already handles internally. |
| 8714 | portage upgrade or downgrade invalidates |
| zmedico | EBUILD_EXIT_STATUS_FILE sanity checks since ebuild.sh |
| | portage version may differ from the current instance that is |
| | running in python. |
| 8716 | Just use ${PN} instead of catpkgsplit(). |
| zmedico | |
| 8718 | In the preprocess_ebuild_env() subshell, check for errors |
| zmedico | and return early when necessary. |
| 8720 | Add a sanity check in dblink.treewalk() so that a broken |
| zmedico | ebuild that doesn't install any files will not be able to |
| | replace a package in the same slot that really installs |
| | files. This check can be bypassed by manually unmerging the |
| | old package or by setting PORTAGE_PACKAGE_EMPTY_ABORT="0" in |
| | /etc/make.conf. |
| 8721 | Don't export PORTAGE_PACKAGE_EMPTY_ABORT to the ebuild |
| zmedico | environment. |
| 8724 | Disable PORTAGE_PACKAGE_EMPTY_ABORT by default since the |
| zmedico | scrollkeeper-9999 upgrade will trigger a false positive. |
| | Thanks to leio for reporting. |
| 8726 | In chk_updated_cfg_files(), avoid scanning for config files |
| zmedico | for paths that aren't writable by the current user. This |
| | prevents Permission denied errors from being triggered later |
| | when trying to scan subdirectories that are inaccessible. |
| 8729 | Bug #200652 - Skip ${T}/environment handling for |
| zmedico | pkg_nofetch(). |
svn path=/main/branches/prefix/; revision=8811
Fabian Groffen [Sun, 2 Dec 2007 21:23:11 +0000 (21:23 -0000)]
filter out GROUP early, as it isn't available on every system, so an ebuild/package shouldn't rely on it anyway
svn path=/main/branches/prefix/; revision=8810
Fabian Groffen [Sun, 2 Dec 2007 21:19:10 +0000 (21:19 -0000)]
Merged from trunk 8661:8696
| 8662 | Remove some unsafe assumptions from preprocess_ebuild_env() |
| zmedico | and note the remaining assumption that save_ebuild_env() is |
| | not overridden by the environment being loaded. |
| 8663 | Make preprocess_ebuild_env() reload a known good version of |
| zmedico | save_ebuild_env() in order to avoid making an assumption |
| | that it hasn't been overridden. |
| 8666 | Filter _RC_GET_KV_CACHE from the saved environment. |
| zmedico | |
| 8668 | Bug #124041 - Make emerge show an informative warning |
| zmedico | message when one or more eclasses override eclasses from |
| | PORTDIR. The warning can be permanently disabled by setting |
| | PORTAGE_ECLASS_WARNING_ENABLE="0" in /etc/make.conf. |
| 8670 | * Move filtering of a bunch of portage config variables from |
| zmedico | save_ebuild_env() to config.environ(). * Add EMERGE_FROM to |
| | the READONLY_PORTAGE_VARS list. |
| 8672 | Add NOCONFMEM to config._environ_filter. |
| zmedico | |
| 8674 | unset ECLASS along with the other variables from inherit(). |
| zmedico | |
| 8676 | Filter more misc environment variables. |
| zmedico | |
| 8678 | Make diefunc() show the path of ${T}/environment since it's |
| zmedico | usually in the stack trace and the user is likely to be |
| | interested in it. |
| 8680 | Automatically try to load environment.bz2 whenever |
| zmedico | "${T}/environment" does not exist, except for "clean" and |
| | "depend" phases. |
| 8682 | Bug #200313 - Detect and report when an ebuild phase exits |
| zmedico | unexpectedly. This is type of behavior is known to be |
| | triggered by things such as failed variable assignments (bug |
| | #190128) or bad substitution errors (bug #200313). We use a |
| | EBUILD_EXIT_STATUS_FILE environment variable to specify a |
| | file that the shell code is supposed to create when it exits |
| | in a normal manner. If the file does not get created like |
| | it's supposed to be then we can conclude that the shell has |
| | exited in some unexpected way. |
| 8683 | --buildpkgonly will not merge anything, so it cancels all |
| zmedico | binary package options. |
| 8686 | Check if ${EBUILD_EXIT_STATUS_FILE} is empty before |
| zmedico | attempting to use it. |
| 8688 | Implement config.pop(). |
| zmedico | |
| 8690 | Make config.pop() properly call config.modifying(). |
| zmedico | |
| 8692 | * In doebuild(), don't create directories for the "clean" or |
| zmedico | "unmerge". * Fix dyn_clean() to clean the status file and |
| | return early when appropriate. |
| 8694 | Fix grammar. |
| zmedico | |
| 8696 | Make doebuild skip directory creation for the "cleanrm" |
| zmedico | command. |
svn path=/main/branches/prefix/; revision=8809
Fabian Groffen [Sun, 25 Nov 2007 16:27:00 +0000 (16:27 -0000)]
Merged from trunk 8642:8659
| 8643 | Use `md5` if `md5sum` is not available (useful for FreeBSD |
| zmedico | users). |
| 8645 | Bug #140180 - Never trigger a LICENSE.missing violation for |
| zmedico | old style virtuals since they don't directly install |
| | anything. |
| 8647 | Bug #200238 - Make ebuild.sh properly bail out when the |
| zmedico | pkg_info() function doesn't exist. |
| 8649 | Implement loading of environment.bz2 for the pkg_info() |
| zmedico | phase. Since a temporary directory is required for |
| | processing of ${T}/environment, and we want a user who's not |
| | in the portage group to be able to run the pkg_info() phase, |
| | PORTAGE_TMPDIR is temporarily overridden with a directory |
| | created by mkdtemp. To make this work, doebuild() creates |
| | the tempdir and cleans it up in a finally block. |
| 8651 | * Load environment.bz2 for the pkg_config() phase. * Run the |
| zmedico | "clean" phase if pkg_config() succeeds. |
| 8653 | The qa_call() function and anything before it are portage |
| zmedico | internals that the user will not be interested in. |
| | Therefore, the stack trace should only show calls that come |
| | after qa_call(). |
| 8654 | Test if ebuild functions are defined before calling them. |
| zmedico | This will be useful if an environment.bz2 has been loaded |
| | and it has missing functions for some reason. For example, |
| | there are a lot of default functions that are empty and |
| | could simply be omitted from the environment. |
| 8655 | Remove the empty default pkg_setup, src_install, |
| zmedico | pkg_preinst, pkg_postinst, pkg_prerm, pkg_postrm, and |
| | pkg_config functions since they do nothing more than clutter |
| | the environment. |
| 8659 | Allow the pkg_info and pkg_config pre/post hooks to run even |
| zmedico | when the ebuild function is not defined. |
svn path=/main/branches/prefix/; revision=8661
Fabian Groffen [Sat, 24 Nov 2007 11:56:12 +0000 (11:56 -0000)]
Merged from trunk 8627:8640
| 8628 | Add support for persistence of colon separated |
| zmedico | SANDBOX_{DENY,READ,PREDICT,WRITE} variables between phases |
| | so things like the global scope addpredict() call in |
| | qt3.eclass will continue to work. |
| 8629 | Filter _E_DOCDESTTREE_ and _E_EXEDESTTREE_ from |
| zmedico | environment.bz2. |
| 8630 | In the grep expression that's generated in |
| zmedico | filter_readonly_variables(), condense redundant identical |
| | expressions into a single one. |
| 8634 | Fix the var_grep variable in filter_readonly_variables() so |
| zmedico | that it's properly local. |
| 8636 | Unconditionally filter some of the SANDBOX_* variables from |
| zmedico | the environment in order to avoid potential interference |
| | problems. For example, having an invalid value for |
| | SANDBOX_LOG prevents the sandbox from killing the ebuild |
| | when a violation occurs. |
| 8638 | When binarytree.populate() finds missing metadata, specify |
| zmedico | which keys are missing so that the user has a clue about |
| | what is wrong. |
| 8640 | Fix quoting to work properly with eval. |
| zmedico | |
svn path=/main/branches/prefix/; revision=8642
Fabian Groffen [Fri, 23 Nov 2007 19:41:09 +0000 (19:41 -0000)]
FILESDIR is already dealt with
svn path=/main/branches/prefix/; revision=8627
Fabian Groffen [Fri, 23 Nov 2007 19:35:06 +0000 (19:35 -0000)]
Remove double variables and sort
svn path=/main/branches/prefix/; revision=8626
Fabian Groffen [Fri, 23 Nov 2007 19:26:48 +0000 (19:26 -0000)]
Merged from trunk 8592:8623
| 8593 | In depgraph.altlist(), measure the bias of circular RDEPEND |
| zmedico | PDEPEND relationships and use it to optimize merge order. |
| 8595 | Filter HOSTTYPE, MACHTYPE, and OSTYPE vars that are set by |
| zmedico | bash. |
| 8597 | Make dyn_package() create a /var/db/pkg/*/*/BINPKGMD5 |
| zmedico | entries so that packages installed via --buildpkg have a |
| | BINPKGMD5 entry matching the package built. |
| 8599 | Document dohtml -p. Thanks to robbat2 for reporting. |
| zmedico | |
| 8601 | When portage reinstalls itself, during inst/rm phases, the |
| zmedico | environment may have been saved by a different version of |
| | ebuild.sh, so it can't trusted that it's been properly |
| | filtered. Therefore, always preprocess the environment when |
| | ${PN} == portage. |
| 8603 | Don't call preprocess_ebuild_env() unless EBUILD_SH_ARGS is |
| zmedico | set since otherwise it can interfere with the environment |
| | for things like the "package" phase. |
| 8605 | Generalize the sed expression in filter_readonly_variables() |
| zmedico | so that it will work with things like 'declare -xr' as well |
| | as 'declare -rx'. |
| 8607 | Allow any errors from save_ebuild_env() to go to stderr |
| zmedico | instead of directing them to /dev/null. |
| 8609 | When filtering the backupenv in create_trees(), be more |
| zmedico | selective and ensure that special variables that come from |
| | the config constructor are preserved. |
| 8611 | Make the sed expression in filter_readonly_variables() |
| zmedico | handle '^declare -r ' by simply removing it. |
| 8613 | Use %% instead of % parameter expansion where appropriate |
| zmedico | for md5sum output. |
| 8615 | Sort hashes for predictable output from |
| zmedico | Manifest._createManifestEntries(). |
| 8617 | For compatibility with previous behavior, so the bashrc |
| zmedico | sourcing after the ebuild environment is fully loaded. |
| 8619 | unset x to avoid global env pollution. |
| zmedico | |
| 8621 | Try again to make bashrc sourcing compatible with previous |
| zmedico | behavior. The bashrcs get an opportunity to set aliases that |
| | will be expanded during sourcing of ebuilds and eclasses. |
| 8623 | Make save_ebuild_env() filter the new source_all_bashrcs() |
| zmedico | function from the environment. |
svn path=/main/branches/prefix/; revision=8625
Fabian Groffen [Wed, 21 Nov 2007 20:15:45 +0000 (20:15 -0000)]
I wasn't out of sync, but simply forgetting that in case of binary packages repo_name is the binhost URL so portage can find the repository for the binary package. Deal with it properly now.
svn path=/main/branches/prefix/; revision=8592
Fabian Groffen [Wed, 21 Nov 2007 20:09:33 +0000 (20:09 -0000)]
Fix bug #199665, apparently I was out of sync with the trunk.
svn path=/main/branches/prefix/; revision=8591
Fabian Groffen [Wed, 21 Nov 2007 19:36:57 +0000 (19:36 -0000)]
Re-apply my paranoide state of mind by filtering out some more variables
svn path=/main/branches/prefix/; revision=8590
Fabian Groffen [Wed, 21 Nov 2007 19:15:44 +0000 (19:15 -0000)]
Merged from trunk 8542:8585
| 8543 | Don't unset ${S} inside save_ebuild_env(). |
| zmedico | |
| 8559 | * Remove bogus "ci" mode. * Sync "scan" mode description |
| zmedico | with 2.1.2 branch. |
| 8569 | Move preinst IMAGE initialzation before bashrc handling. |
| zmedico | |
| 8573 | Clean up some local variables that are needlessly saved in |
| zmedico | the environment. |
| 8575 | Move environment saving from dyn_compile() to dyn_install() |
| zmedico | so that state from src_install() is saved. |
| 8577 | Generate an eerror elog message when an ebuild prerm or |
| zmedico | postrm phase fails. |
| 8578 | Fix the diefunc overlay message so that it doesn't trigger |
| zmedico | falsely in prerm or postrm. |
| 8581 | * Make save_ebuild_env() filter some more variables. * Make |
| zmedico | dyn_install() filter S when it's no longer needed. |
| 8583 | In dyn_install(), don't cleanse S from the global |
| zmedico | environment, in case the user wants to repeat the phase |
| | (like with FEATURES=noauto and the ebuild command). Only |
| | cleanse it from environment.bz2. |
| 8585 | Replace usage of the "myarg" global variable with the |
| zmedico | equivalent readonly EBUILD_SH_ARGS variable. |
svn path=/main/branches/prefix/; revision=8589
Fabian Groffen [Wed, 21 Nov 2007 19:01:32 +0000 (19:01 -0000)]
Merged from trunk 8530:8542
| 8531 | Implement loading of environment.bz2 from binary and |
| zmedico | installed packages. For binary packages, it's loaded prior |
| | to pkg_setup(). For installed packages, it's loaded prior to |
| | pkg_prerm(). For simplicity, the current implementation will |
| | cause the current environment to override *everything* in |
| | the environment that is being processed. In the future, it |
| | should be more selective and only override the parts that |
| | are strictly necessary. |
| 8532 | Make preprocess_ebuild_env() explicitly filter out FEATURES |
| zmedico | since the value for that variable should never come from a |
| | previously saved environment. |
| 8533 | Make save_ebuild_env() filter out lots of variables that |
| zmedico | don't need to be saved. |
| 8534 | Make AA, PF, and WORKDIR readonly. |
| zmedico | |
| 8535 | Move LD_PRELOAD and FAKEROOTKEY filtering from |
| zmedico | filter_readonly_variables() to save_ebuild_env(). |
| 8536 | Add some more variables to filter in |
| zmedico | filter_readonly_variables() and save_ebuild_env(). |
| 8537 | Now that save_ebuild_env() filters variables that could |
| zmedico | cause interference, preprocess_ebuild_env() can rely on it |
| | to clean up the environment enough so that anything left can |
| | be allowed to override variables or functions from the |
| | current environment. |
| 8538 | When ${T}/environment is available, do not source the ebuild |
| zmedico | since that is redundant. This solves bug #46223. |
| 8539 | When ROOT != "/" we only want overrides from the calling |
| zmedico | environment to apply to the config that's associated with |
| | ROOT != "/", so we wipe out the "backupenv" for the config |
| | that is associated with ROOT == "/" and regenerate it's |
| | incrementals. Thanks to solar for the suggestion. |
| 8540 | Don't make variables readonly during the "depend" phase. |
| zmedico | |
| 8541 | Fix ${EBUILD_PHASE} quoting. |
| zmedico | |
| 8542 | Instead of filtering out all readonly variables, make it |
| zmedico | selective so that any readonly variables that are not |
| | explicitly filtered are allowed to be saved. |
svn path=/main/branches/prefix/; revision=8588
Fabian Groffen [Wed, 21 Nov 2007 19:00:01 +0000 (19:00 -0000)]
Revert my paranoia patch, such that I can cleanly apply zmedico's latest patches
svn path=/main/branches/prefix/; revision=8587
Fabian Groffen [Mon, 19 Nov 2007 19:15:12 +0000 (19:15 -0000)]
I made a pass over what's in environment.bz2 and unset all that look
like they should never ever be initialised like they are saved on the
target system (e.g. non-matching prefix), and those that just could leak
some information you don't want to be leaked in a paranoia mood.
svn path=/main/branches/prefix/; revision=8530
Fabian Groffen [Mon, 19 Nov 2007 18:20:13 +0000 (18:20 -0000)]
Merged from trunk 8523:8528
| 8524 | Fix PROFILE_ONLY_VARIABLES handling in the config |
| zmedico | constructor so that variables are appropriately filtered |
| | from "backupenv", since otherwise they can leak in from |
| | there. |
| 8525 | Use the existing RootConfig class to serve as a replacement |
| zmedico | for the EmergeConfig class. They both served roughly the |
| | same purpose and it was messy the way that EmergeConfig |
| | inherited from the portage.config class. It's better to |
| | avoid inheritance here, expecially since it doesn't provide |
| | anything really useful. |
| 8526 | Disable logging and ${T}/environment saving during the |
| zmedico | pkg_info() phase. |
| 8527 | When creating environment.bz2 at the end of dyn_compile(), |
| zmedico | reduce bloat by filtering out functions that are defined |
| | internally by portage. This reduces the size of the |
| | resulting environment.bz2 file by approximately 10 KB. |
| 8528 | In bash-3.2_p20+ an attempt to assign BASH_*, FUNCNAME, |
| zmedico | GROUPS or any readonly variable cause the shell to exit |
| | while executing the "source" builtin command. To avoid this |
| | problem, a new save_ebuild_env() function filters those |
| | variables out and discards them. See bug #190128. |
svn path=/main/branches/prefix/; revision=8529
Fabian Groffen [Sun, 18 Nov 2007 21:08:28 +0000 (21:08 -0000)]
Merged from trunk 8515:8521
| 8516 | Speed up LibraryPackageMap.update() by pulling NEEDED from |
| zmedico | the vardbapi.aux_get() cache. This greatly reduces the |
| | amount of needless IO that has been happening just prior to |
| | the postinst phase in dblink.treewalk(). We may want to |
| | consider having LibraryPackageMap work directly from the |
| | vardbapi instead of creating the intermediate |
| | /var/cache/edb/library_consumers file. |
| 8518 | Clean up vardbapi.counter_tick_core() and replace shell code |
| zmedico | with pure python. |
| 8519 | Fix --usepkgonly code in depgraph.select_files() so that it |
| zmedico | only operates on the Package type that it expects. |
| 8520 | Fix NEEDED logic in vardbapi.aux_get() so that empty NEEDED |
| zmedico | doesn't trigger unnecessary cache pulls. |
| 8521 | Bug #198398 - Enable Manifest generation when there are no |
| zmedico | hash functions available for types such as RMD160. Now it's |
| | possible to generate a Manifest when python-2.5 is built |
| | without ssl support. MANIFEST1_REQUIRED_HASH and |
| | MANIFEST2_REQUIRED_HASH are the only two functions that are |
| | strictly required now (MD5 and SHA1). |
svn path=/main/branches/prefix/; revision=8523
Fabian Groffen [Fri, 16 Nov 2007 14:01:58 +0000 (14:01 -0000)]
Inverse logic again... only run if NOT in prefix
svn path=/main/branches/prefix/; revision=8517
Fabian Groffen [Fri, 16 Nov 2007 07:57:24 +0000 (07:57 -0000)]
Merged from trunk 8510:8513
| 8511 | Bug #199311 - Make dblink.getcontents() show the path of the |
| zmedico | CONTENTS file when any kind of parse error occurs. |
| 8512 | Don't export ${IMAGE} to the ebuild environment anymore |
| zmedico | since everything uses ${D} now (including the entire tree). |
| 8513 | Set IMAGE for minimal backward compatibility with overlays |
| zmedico | or user's bashrc, but don't export it. |
svn path=/main/branches/prefix/; revision=8515
Fabian Groffen [Fri, 16 Nov 2007 07:48:04 +0000 (07:48 -0000)]
inverse logic to make it do what I intended it to do
svn path=/main/branches/prefix/; revision=8514
Fabian Groffen [Thu, 15 Nov 2007 22:00:22 +0000 (22:00 -0000)]
Make pipping happy and allow the broken install_name check not to die
svn path=/main/branches/prefix/; revision=8510
Fabian Groffen [Thu, 15 Nov 2007 21:23:55 +0000 (21:23 -0000)]
manual vimdiff with trunk; add missing dodir if dosym's target directory doesn't exist
svn path=/main/branches/prefix/; revision=8509
Fabian Groffen [Thu, 15 Nov 2007 19:49:35 +0000 (19:49 -0000)]
Don't try to do ldconfig stuff in prefix, it fails anyway
svn path=/main/branches/prefix/; revision=8508
Fabian Groffen [Thu, 15 Nov 2007 19:44:14 +0000 (19:44 -0000)]
Also install emaint in usr/bin
svn path=/main/branches/prefix/; revision=8507
Fabian Groffen [Thu, 15 Nov 2007 19:40:21 +0000 (19:40 -0000)]
Merged from trunk 8492:8503
| 8493 | * Remove all references to the obsolete Package.digraph_node |
| zmedico | attribute. * Reimplement Package comparison methods since |
| | the previous way didn't seem to function properly for dict |
| | keys. * Clean up depgraph._add_pkg() to use the Package |
| | object attributes. |
| 8494 | Add DependencyArg instances as parents of packages in the |
| zmedico | digraph since these relationships should be useful during |
| | backtracking. |
| 8495 | Remove the depgraph.pkg_node_map attribute and use other |
| zmedico | means to accomplish the same thing. |
| 8496 | Make depgraph._add_pkg() match the package with all possible |
| zmedico | args and add them to the digraph. |
| 8497 | Make depgraph._complete_graph() properly specify SetArg |
| zmedico | instances as parents of each Dependency, similar to the want |
| | that select_files() does. |
| 8498 | Make the slot collision display show all collisions instead |
| zmedico | of just the first one. |
| 8499 | Make 'full' the default mode, since 'scan' can be annoying |
| zmedico | since it ommits relevant info. |
| 8500 | In the slot collision display, show a maximum of 3 parents |
| zmedico | for each package in order to avoid flooding the display. |
| 8501 | * Replace references to deprecated ${IMAGE} with equivalent |
| zmedico | ${D}. * Remove redundant trailing slashes and fix quoting. |
| 8502 | Make dir_get_metadata() return early if the current user |
| zmedico | does not have write access to /var/cache/edb. Thanks to |
| | Cardoe for reporting. |
| 8503 | Fix quoting for `source ${EBUILD}`. |
| zmedico | |
svn path=/main/branches/prefix/; revision=8506
Fabian Groffen [Thu, 15 Nov 2007 19:09:10 +0000 (19:09 -0000)]
Merged from trunk 8481:8492
| 8482 | Clean up expansion of set arguments in |
| zmedico | depgraph.select_files(). |
| 8483 | Convert all the checks in repoman.checks to use a new |
| zmedico | LineCheck interface that takes a single line as an argument. |
| | This has at least a few of benefits: * Eliminates lots of |
| | redundant code * Error messages are ordered by line number |
| | across all checks The performance is slightly worse due to |
| | the increased number of method calls, but it's not really |
| | noticeable in comparison to the time consumed by dependency |
| | checks. Thanks to Petteri Räty <betelgeuse@gentoo.org> for |
| | the initial patch which I only made a few minor |
| | modifications to. |
| 8484 | Fix WorldSet.cleanPackage() so that it properly preserves |
| zmedico | nonatoms (sets) in the world file. |
| 8485 | Make the EbuildQuote.missing_quotes regex accept single |
| zmedico | quotes where it accepts double quotes in order to eliminate |
| | some false positives. Thanks to Krzysiek Pawlik |
| | <nelchael@gentoo.org> for reporting. |
| 8486 | Wrap accesses to depgraph._set_atoms.findAtomForPackage() in |
| zmedico | a new depgraph._get_arg_for_pkg() method. |
| 8487 | Implement mapping of packages to instances of DependencyArg |
| zmedico | in depgraph._get_arg_for_pkg(). Among other things, this |
| | provides a way to know whether or not a specific package has |
| | been specified as an argument, which determines whether or |
| | not it can be removed from the graph during backtracking. |
| 8488 | Fix depgraph._get_arg_for_pkg() so that it compares package |
| zmedico | types to help ensure a proper match. |
| 8489 | * Provide reasonable default values for Dependency priority |
| zmedico | and depth attributes. * Remove depgraph.create() since it's |
| | no longer needed. * Remove depgraph._get_parent_sets() and |
| | instead get the information from DependencyArg attributes. |
| 8490 | Make diefunc() clean up QA_INTERCEPTORS in case it is called |
| zmedico | from inherit() since sed called below. |
| 8491 | Bug #197797 - Set umask to 022 so that created files (such |
| zmedico | as the world file) have sane permissions. |
| 8492 | Make the Package class emulate the interface of it's own |
| zmedico | digraph_node tuple so that the Package instance itself can |
| | be added directly to the digraph. |
svn path=/main/branches/prefix/; revision=8505
Fabian Groffen [Thu, 15 Nov 2007 19:04:14 +0000 (19:04 -0000)]
Merged from trunk 8470:8481
| 8471 | make.globals should not be relative to config_root because |
| zmedico | it only contains constants. |
| 8472 | Revert accidental hunk from bug 198491. Haven't tested this |
| zmedico | yet. |
| 8473 | Bug #198491 - Disable termios.OPOST post-processing of |
| zmedico | output on the slave pty file descriptor since otherwise |
| | weird things like \n -> \r\n transformations may occur. |
| | Thanks to Ulrich Mueller <ulm@gentoo.org> for this patch. |
| 8474 | Remove the workaround for \n -> \r\n transformations in |
| zmedico | SpawnTestCase.testLogfile() since the problem is solved by |
| | the patch from bug #198491. |
| 8475 | Create classes to encapsulate eache of the depgraph argument |
| zmedico | types: atoms, packages and sets. |
| 8476 | Fix incorrect type in depgraph._missing_args. |
| zmedico | |
| 8477 | revert getMergeList to return CPVs again instead of atoms |
| genone | |
| 8478 | Move glsa-check from gentoolkit into portage so the |
| genone | gentoolkit version can be removed after 2.2 is released |
| 8479 | move checkfile parsing into its own function |
| genone | |
| 8480 | if multiple glsas result in the same cat/pkg:slot being |
| genone | affected only use the highest resulting atom |
| 8481 | fix typo and missing classmethod declaration |
| genone | |
svn path=/main/branches/prefix/; revision=8504
Fabian Groffen [Thu, 8 Nov 2007 22:39:42 +0000 (22:39 -0000)]
Merged from trunk 8467:8468
| 8468 | Tweak EOutput.term_columns calculation for TERM="dumb" so |
| zmedico | that it behaves like TERM="cons25" currently does. Thanks to |
| | Ulrich Mueller <ulm@gentoo.org> for the patch. |
svn path=/main/branches/prefix/; revision=8470
Fabian Groffen [Thu, 8 Nov 2007 22:36:33 +0000 (22:36 -0000)]
Merged from trunk 8463:8464
| 8464 | Bug #198492 - Make quickpkg create $PKGDIR if it doesn't |
| zmedico | already exist. |
svn path=/main/branches/prefix/; revision=8469
Fabian Groffen [Thu, 8 Nov 2007 22:31:55 +0000 (22:31 -0000)]
Make sure EAPI is a string, and that it includes 'prefix' if appropriate.
svn path=/main/branches/prefix/; revision=8467
Fabian Groffen [Thu, 8 Nov 2007 22:09:47 +0000 (22:09 -0000)]
Attempt to clean up the error messages
svn path=/main/branches/prefix/; revision=8465
Fabian Groffen [Thu, 8 Nov 2007 21:58:39 +0000 (21:58 -0000)]
Don't terminate with a backtrace when a 404 is encountered. This
try/catch makes it just slighlty better, but not really as nice as it
should be (lots of misalignment, redundant/double data and missing data):
% emerge -Kgp gawk
These are the packages that would be merged, in order:
Calculating dependencies -
Fetching binary packages info...
!!! Unable to get listing: 404 Server did not respond successfully (404: Not Found)
-- DONE!
... done!
svn path=/main/branches/prefix/; revision=8463
Fabian Groffen [Thu, 8 Nov 2007 21:53:31 +0000 (21:53 -0000)]
Don't do:
Calculating dependencies |Fetching binary packages info...
but instead put "Fetching ..." on it's own line.
svn path=/main/branches/prefix/; revision=8461
Fabian Groffen [Thu, 8 Nov 2007 21:48:17 +0000 (21:48 -0000)]
It is not cool and/or helpfull to see an HTML dump of some page in case it is not what is expected (like a 404).
svn path=/main/branches/prefix/; revision=8460
Fabian Groffen [Thu, 8 Nov 2007 19:25:03 +0000 (19:25 -0000)]
Merged from trunk 8456:8457
| 8457 | For unsatisfied dependencies, shorten the per-package EAPI |
| zmedico | mask output and show an informative message whenever an EAPI |
| | mask is encountered. |
svn path=/main/branches/prefix/; revision=8459
Fabian Groffen [Wed, 7 Nov 2007 22:21:29 +0000 (22:21 -0000)]
Try a more Python-like approach to getting what we need from EAPI, as
suggested by zmedico.
svn path=/main/branches/prefix/; revision=8456
Fabian Groffen [Wed, 7 Nov 2007 21:54:01 +0000 (21:54 -0000)]
PYTHON_EPREFIX -> get rid of retarded name
First shot at some EAPI scheme which is closer towards the trunk than it
is now. Main tree ebuilds can technically be marked EAPI=1 these days,
which is not reflected in prefix, as we use the static EAPI="prefix".
To gain the same EAPI levels here, EAPI in prefix is extended to consist
of two parts, "prefix" and the EAPI number of the main tree. Of course
the latter can be omitted if it 0 and/or omitted in the main tree.
svn path=/main/branches/prefix/; revision=8455
Fabian Groffen [Wed, 7 Nov 2007 20:02:44 +0000 (20:02 -0000)]
Merged from trunk 8450:8453
| 8451 | Make depgraph.select_files() perform internal expansion of |
| zmedico | package set arguments since ideally the depgraph needs to be |
| | awary of the precise origin of each atom. |
| 8452 | Fix broken logic for --update greedy slot atoms in |
| zmedico | depgraph.select_files(). |
| 8453 | Really fix broken logic for --update greedy slot atoms in |
| zmedico | depgraph.select_files(). |
svn path=/main/branches/prefix/; revision=8454
Fabian Groffen [Tue, 6 Nov 2007 18:36:03 +0000 (18:36 -0000)]
Also don't QA complain about the prefix USE-flag, which is like arch_* elibc_* and kernel_* a special non-user specifyable thing
svn path=/main/branches/prefix/; revision=8450
Fabian Groffen [Tue, 6 Nov 2007 18:25:11 +0000 (18:25 -0000)]
Merged from trunk 8435:8447
| 8436 | Allow multislot packages to be added to the world file via |
| zmedico | --noreplace. Having these atoms in the world file will |
| | trigger recommendations to run emaint in some cases, like |
| | when running `emerge -e world`. The atoms need to be in |
| | the world file to prevent multislot packages from being |
| | removed by --depclean though. |
| 8437 | remove O and PPID from being readonly. O is set python |
| WarnerBro | side (and we will hopefully stop being exported soon. PPID |
| | is ro by bash, so no need to declare it twice |
| 8438 | Bug #198129 - Prevent SLOT atoms like sys-devel/binutils:0 |
| zmedico | from being inappropriately recorded in the world file when |
| | USE=multislot is enabled. |
| 8439 | Fix create_world_atom() logic some more for bug #198129. |
| zmedico | |
| 8442 | Go ahead and exempt selected profile-specific USE_EXPAND |
| zmedico | flags from IUSE QA Notices since we are planning to make |
| | these particular flags into implicit members of IUSE. We |
| | can make this extensible later, but for now we just want |
| | to eliminate some useless QA Notices (a subset of bug |
| | #70648). We're not exempting any non profile- specific |
| | USE_EXPAND flags here. For non profile-specific flags, we |
| | intend to implement an IUSE syntax extension (bug |
| | #133327). |
| 8444 | Remove references to ${O} in dyn_spec() since antarus made |
| zmedico | that variable mutable. |
| 8445 | Simplify and fix bugs in is_valid_package_atom(). |
| zmedico | |
| 8447 | Remove the usage.obsolete "KEYWORDS contain -*" warning |
| zmedico | since people are using -* to indicate that a package |
| | should not be tried on archs other than those for which it |
| | already has KEYWORDS. |
svn path=/main/branches/prefix/; revision=8449
Fabian Groffen [Mon, 5 Nov 2007 21:06:30 +0000 (21:06 -0000)]
Merged from trunk 8419:8432
| 8420 | When evaluating *DEPEND conditionals for the Packages |
| zmedico | metadata index, do not use IUSE to filter USE since there is |
| | currently no guarantee that IUSE properly defines all of the |
| | necessary flags. |
| 8421 | In portdbapi.cp_list(), validate the ebuild name to ensure |
| zmedico | that it matches the name of the package. |
| 8423 | Make Manifest.create() do some basic validation of ebuild |
| zmedico | file names like portdbapi.cp_list() would do. |
| 8426 | Make exception strings more informative. |
| zmedico | |
| 8428 | Replace StringIO usage with a simple list of lines. The |
| zmedico | iteration interface is practically identical but the list of |
| | lines if more efficient because the lines only have to be |
| | split one time for each ebuild instead of for each check. |
| 8429 | Fix 'TypeError: not all arguments converted during string |
| zmedico | formatting' issues with the EbuildNestedDie check. |
| 8431 | Add support for package sets in WorldHandler. |
| zmedico | |
| 8432 | Make WorldHandler lock the world file when in --fix mode. |
| zmedico | |
svn path=/main/branches/prefix/; revision=8435
Fabian Groffen [Mon, 5 Nov 2007 21:03:53 +0000 (21:03 -0000)]
Merged from trunk 8400:8418
| 8401 | Bug #197965 - When fetch() encounters a checksum failure, |
| zmedico | look for an identical file from a previous checksum failure |
| | in order to avoid consuming unnecessary disk space with |
| | duplicate files. |
| 8402 | if mode=1 and `dialog` is not usable, abort #197990 by |
| SpankMan | DominikBuerkle |
| 8403 | Bug #197965 - Make fetch() bail out after 5 checksum |
| zmedico | failures for a particular file since downloading the same |
| | file repeatedly from every single available mirror is a |
| | waste of bandwidth and time. |
| 8405 | Call die() so that the $TMP directory is always properly |
| zmedico | cleaned up. |
| 8408 | Bug #197797 - Do not actively clear o+rx permission bits on |
| zmedico | the /var/lib/portage directory. Only clear the o+w bits. |
| | This allows users who aren't in the portage group to have |
| | read access to the world file by default, but |
| | administrators can explicitly chmod o-rx that directory if |
| | necessary, and portage will leave those bits alone. This |
| | makes the permission settings in dblink.treewalk() |
| | consistent with those that are already defined in |
| | config._init_dirs(). |
| 8410 | For sanity, pass an actual list of keys into aux_get() |
| zmedico | instead of iterating over a set that happens to be mutable |
| | (though it remains constant in practice). |
| 8412 | Make fetch() behave like the ebuild has |
| zmedico | RESTRICT="primaryuri" after 2 checksum failures for a |
| | fetched file. This should increase the probability of |
| | fetching the correct file before the maximum number of |
| | tries is reached. |
| 8414 | Generate a usage.obsolete warning whenever -* is found in |
| zmedico | KEYWORDS. |
| 8416 | In fetch(), replace checksum_failure_counts dict with |
| zmedico | single int counter. |
| 8418 | Clean up ACCEPT_KEYWORDS incremental stacking logic and fix |
| zmedico | some minor inconsistencies. |
svn path=/main/branches/prefix/; revision=8434
Fabian Groffen [Mon, 5 Nov 2007 20:46:22 +0000 (20:46 -0000)]
Allow to compile on Interix which only has utime, original patch by markus.duft at salomon.at in bug #198180
svn path=/main/branches/prefix/; revision=8433
Fabian Groffen [Sat, 3 Nov 2007 19:28:56 +0000 (19:28 -0000)]
Merged from trunk 8389:8397
| 8390 | Bug #197932 - Make dbapi._cpv_sort_ascending() preserve |
| zmedico | explicit -r0 for consistency in findname and aux_get calls. |
| 8392 | Remove redundant code from previous commit. |
| zmedico | |
| 8397 | Fix update_config_files() so that it uses update_dbentry() |
| zmedico | to handle update commands since that already supports |
| | slotmove commands for SLOT atoms. |
svn path=/main/branches/prefix/; revision=8400
Fabian Groffen [Sat, 3 Nov 2007 19:26:31 +0000 (19:26 -0000)]
Due to the implicit subshell caused by the pipe abort wasn't ever set,
even though it should have. Now we die early, with help of die() being
able to die in this case.
svn path=/main/branches/prefix/; revision=8399
Fabian Groffen [Sat, 3 Nov 2007 19:03:05 +0000 (19:03 -0000)]
Use an elog file /inside/ the prefix. It would have been better to use a variable for this, such that admins/users can change this location. Thanks DirkT for pointing out the prefix issue.
svn path=/main/branches/prefix/; revision=8396
Fabian Groffen [Sat, 3 Nov 2007 15:50:43 +0000 (15:50 -0000)]
Don't backtrace if EPREFIX is not in the metadata set.
svn path=/main/branches/prefix/; revision=8389
Fabian Groffen [Sat, 3 Nov 2007 13:12:49 +0000 (13:12 -0000)]
Merged from trunk 8356:8387
| 8357 | In the 'there are no ebuilds to satisfy "foo"' message, |
| zmedico | discard null/ from failed cpv_expand category expansion. |
| 8358 | Optimize merge order to try and select nodes that only have |
| zmedico | unsatisfied PDEPEND slightly earlier. This solves a problem |
| | with xorg-server being merged too early during an all binary |
| | install (since DEPEND is ignored for binaries), triggering |
| | built_with_use() calls to fail as reported in bug #189966. |
| | Since DEPEND is discarded in cases like this, it is |
| | important to exploit the difference between PDEPEND and |
| | RDEPEND in order to optimize merge order. Without this |
| | optimization, the merge order is technically correct, but |
| | not as optimal as it should be and has lots of potential to |
| | trigger issues with built_with_use() or similar things that |
| | require better optimization of merge order. |
| 8359 | Collapse 2 identical code hunks into 1. |
| zmedico | |
| 8360 | Fix ignore_priority logic in depgraph.altlist() in order to |
| zmedico | handle some cases where it was possible for nodes to be |
| | selected without their PDEPENDs being propperly added to the |
| | asap_nodes list. |
| 8366 | Make sure vardbapi.cp_list() always sorts the results. |
| zmedico | |
| 8373 | Bug #197594 - Document FEATURES="lmirror". |
| zmedico | |
| 8379 | Return early from config.getMaskAtom() as soon as a matching |
| zmedico | unmask atom is found. |
| 8381 | Make portdbapi.gvisible() use portdbapi._aux_cache_keys for |
| zmedico | metadata pulls. |
| 8383 | Sort scanlist and ebuildlist to ensure that repoman always |
| zmedico | processes packages in a predictable order. |
| 8385 | In portage.fetch(), condense digest check output to a single |
| zmedico | line for all digests. |
| 8387 | TODO: Make update_config_files() handle slotmove commands |
| zmedico | for SLOT atoms. |
svn path=/main/branches/prefix/; revision=8388
Fabian Groffen [Thu, 1 Nov 2007 19:23:20 +0000 (19:23 -0000)]
Merged from trunk 8340:8355
| 8341 | Implement a "consistent" depgraph parameter (enabled by |
| zmedico | --consistent) that can be used ensure that installation of |
| | new packages does not break any deep dependencies of |
| | required sets (args, system, or world). Unfortunately, the |
| | performance penalty for small dep calculations is too great |
| | to enable this parameter by default. At least it will be |
| | useful for testing backtracking behavior when that is |
| | implemented. |
| 8342 | Optimize xmatch "bestmatch-visible" to do fewer metadata |
| zmedico | accesses by using the same code as "minimum-visible" but |
| | with a reverse iterator. |
| 8343 | Implement license filtering for xmatch minimum-visible and |
| zmedico | bestmatch-visible. Also, make the gvisible license filtering |
| | conditional on config.local_config since repoman doesn't do |
| | license filtering. |
| 8344 | Fix "args" set handling wrt $ROOT in |
| zmedico | depgraph._complete_graph(). |
| 8345 | Remove a few unused depgraph attributes. |
| zmedico | |
| 8346 | Gather some ignored dependencies so that they can be |
| zmedico | properly processed by the depgraph when "conistent" mode is |
| | enabled. |
| 8347 | Defer selection of package dependency atoms until they are |
| zmedico | actually needed since the appropriate atom selection |
| | behavior can change between the time that the package is |
| | initially added to the graph and when it's dependencies are |
| | traversed (like when --consistent is enabled). |
| 8348 | Update the FEATURES=mirror docs to more accurately reflect |
| zmedico | behavior. |
| 8349 | Fix diefunc() so that it doesn't report that the ebuild is |
| zmedico | from an overlay when EMERGE_FROM == binary. |
| 8350 | Make depgraph.select_files() recursively expand sets given |
| zmedico | as arguments so that containment tests in _get_parent_sets() |
| | properly match atoms in nested sets (like if world contains |
| | system). Otherwise, atoms from nested sets would get |
| | recorded in the world file. |
| 8351 | Add a check for redundant cd "${S}" statements on the first |
| zmedico | line of src_(compile|install|test) ebuild methods. Thanks to |
| | Petteri Räty <betelgeuse@gentoo.org> for this patch. |
| 8352 | Avoid making unnecessary copies of PackageSet._atoms by |
| zmedico | replacing calls to self.getAtoms() with self._load(). |
| 8353 | Make the EbuildUselessCdS check for both quoted and unquoted |
| zmedico | ${S} so the user doesn't have to fix quoting before this |
| | check will recognize the violation. |
| 8354 | Remove an extra \$ from the EbuildQuote.var_reference regex |
| zmedico | so that it will properly match things like variable |
| | references without braces, like $S. |
| 8355 | Properly escape { and } characters in regular expressions |
| zmedico | even though it seems to work either way. |
svn path=/main/branches/prefix/; revision=8356
Fabian Groffen [Mon, 29 Oct 2007 21:03:37 +0000 (21:03 -0000)]
Merged from trunk 8328:8338
| 8329 | Sort all dbapi.cp_list() results in ascending order and |
| zmedico | cache the results when possible. The order is preserved in |
| | dbapi.match() so those results are also sorted. |
| 8331 | Fix cp_list() to prevent it from returning a reference to |
| zmedico | one of it's internal lists. |
| 8332 | Optimize stdout_spinner.update() methods so that they don't |
| zmedico | waste cpu time by flushing ouput to the tty too frequently. |
| 8333 | Fix SetConfig.getSetAtoms() to stop initializing ignorelist |
| zmedico | in the parameter list since otherwise the ignorelist |
| | persists between calls and causes unpredictable results for |
| | callers. |
| 8334 | Fix --depclean to use SetConfig.getSetAtoms() and also fix a |
| zmedico | broken reference to packagesets which is now settings.sets. |
| 8335 | Fix PackageSet.getAtoms() and getNonAtoms() so that they |
| zmedico | don't return references to private data structures. |
| 8336 | Make portdbapi.cp_list() use os.listdir() instead of |
| zmedico | portage.listdir() since portage.listdir() has unnecessary |
| | overhead and it's cache isn't needed since cp_list() has |
| | it's own cache. |
| 8337 | Rewrite the dblink.getcontents() code to use str.split(" ") |
| zmedico | for splitting CONTENTS lines so that even file paths that |
| | end with spaces can be handled. This patch makes the fix for |
| | bug #196836#c6 more complete. Some code for parsing old |
| | malformed symlink entries has been removed sinces it's |
| | probably not useful or worth maintaining anymore. |
| 8338 | Use rstrip("\n") to remove trailing newlines from CONTENTS |
| zmedico | lines. |
svn path=/main/branches/prefix/; revision=8340
Fabian Groffen [Mon, 29 Oct 2007 19:54:08 +0000 (19:54 -0000)]
Darwin7 doesn't have lchown implementation. We only need it for links,
which on Darwin don't have an owner, so only try that when lchown is
available.
svn path=/main/branches/prefix/; revision=8339
Fabian Groffen [Sun, 28 Oct 2007 08:27:25 +0000 (08:27 -0000)]
Apply 'disable chflags when apparently absent on BSD'-patch from zmedico on gentoo-alt ML. Cause not yet found.
svn path=/main/branches/prefix/; revision=8330
Fabian Groffen [Sat, 27 Oct 2007 21:00:43 +0000 (21:00 -0000)]
Merged from trunk 8323:8324
| 8324 | Replace depgraph._slot_node_map with _slot_pkg_map so that |
| zmedico | it's easier to get existing Package instances. |
svn path=/main/branches/prefix/; revision=8328
Fabian Groffen [Sat, 27 Oct 2007 20:58:43 +0000 (20:58 -0000)]
At least my grep doesn't like :digit:, neither do I
svn path=/main/branches/prefix/; revision=8327
Fabian Groffen [Sat, 27 Oct 2007 20:49:39 +0000 (20:49 -0000)]
Only run prefix QA-checks if there is a prefix, to avoid false
positives.
svn path=/main/branches/prefix/; revision=8326
Fabian Groffen [Sat, 27 Oct 2007 20:43:57 +0000 (20:43 -0000)]
Since path.normpath("") = ".", avoid doing this, such that EPREFIX
remains empty when it should be, instead of "." which means something
entirely different.
svn path=/main/branches/prefix/; revision=8325
Fabian Groffen [Sat, 27 Oct 2007 20:40:09 +0000 (20:40 -0000)]
Not sure what idiot put bash [[ in configure.in, but it probably was me.
svn path=/main/branches/prefix/; revision=8323
Fabian Groffen [Sat, 27 Oct 2007 20:35:38 +0000 (20:35 -0000)]
Add --with-eapi to be used by prefix for setting it to "prefix",
defaulting to 1, the current value the trunk uses.
svn path=/main/branches/prefix/; revision=8322
Fabian Groffen [Sat, 27 Oct 2007 18:40:05 +0000 (18:40 -0000)]
Merged from trunk 8315:8319
| 8316 | In portage.fetch(), condense digest check ouput to a single |
| zmedico | line for all digests. |
| 8317 | Fix broken $ROOT handling for setconfig in the MergeTask |
| zmedico | constructor. |
| 8318 | Reuse an existing EmergeConfig instance instead of |
| zmedico | constructing a new one. |
| 8319 | Make depgraph._select_atoms() more flexible by allowing the |
| zmedico | repositories to be passed in as a parameter. |
svn path=/main/branches/prefix/; revision=8321
Fabian Groffen [Sat, 27 Oct 2007 18:26:02 +0000 (18:26 -0000)]
Drop ARCH pseudo-check, its result is never used (so it seems). Default offset-prefix (EPREFIX) to an empty string, as that should be it for non-prefix
svn path=/main/branches/prefix/; revision=8320
Fabian Groffen [Fri, 26 Oct 2007 18:11:53 +0000 (18:11 -0000)]
Merged from trunk 8312:8313
| 8313 | Optimize repoman to share portdbapi.cp_list() results |
| zmedico | between all profiles since those results never change. The |
| | cached results also propagate to the xmatch match-all when |
| | appropriate (old-style virtuals are excluded since they are |
| | profile dependent). |
svn path=/main/branches/prefix/; revision=8314
Fabian Groffen [Fri, 26 Oct 2007 17:33:22 +0000 (17:33 -0000)]
Merged from trunk 8299:8310
| 8300 | Allow sets to contain non-atoms |
| genone | |
| 8301 | use a @ prefix for sets, and replace world/system with their |
| genone | real prefixed names if found on the commandline |
| 8302 | use SetConfig.getSetAtoms instead of PackageSet.getAtoms for |
| genone | expanding sets to allow recursion, and drop the default |
| | 'sets/' prefix for setnames |
| 8303 | break potential cycles in set expansion |
| genone | |
| 8304 | update notes about package sets |
| genone | |
| 8305 | Optimize the algorithm used for expansion of set arguments |
| zmedico | into atoms. |
| 8306 | Prevent premature expansion of old-style virtuals inside |
| zmedico | depgraph.select_files(). |
| 8307 | Allow sets to get through world file validation and expand |
| zmedico | properly. It's now possible to put @system in the world file |
| | and get the old behavior where world includes system. |
| 8308 | Make emerge add sets to the world file as one would expect. |
| zmedico | |
| 8309 | Optimize repoman visibility checks to access as little |
| zmedico | metadata as possible. (improves performance especially in |
| | cases where metadata needs to be generated). This works by |
| | starting at the lowest version since that's most likely to |
| | have keywords and it returns as soon as the first visible |
| | package is found. |
| 8310 | Add missing break statement for xmatch minimum-visible. |
| zmedico | |
svn path=/main/branches/prefix/; revision=8312
Fabian Groffen [Fri, 26 Oct 2007 17:30:18 +0000 (17:30 -0000)]
Show the double prefix, as it is sort of confusing to see just one and
an error that it is double.
svn path=/main/branches/prefix/; revision=8311
Fabian Groffen [Thu, 25 Oct 2007 20:06:55 +0000 (20:06 -0000)]
Merged from trunk 8290:8294
| 8291 | Handle multiple consecutive spaces in filenames as per bug |
| zmedico | #196836#c6. |
| 8292 | Remove obsolete whitespace handling code for "obj" filenames |
| zmedico | in CONTENTS. |
| 8293 | Handle a potential IndexError. |
| zmedico | |
| 8294 | Correct expected split counts for CONTENTS lines. |
| zmedico | |
svn path=/main/branches/prefix/; revision=8299
Fabian Groffen [Thu, 25 Oct 2007 20:04:12 +0000 (20:04 -0000)]
Merged from trunk 8281:8290
| 8282 | Add back support for greedy SLOTs when --update is enabled |
| zmedico | as per bug #150361. This is currently disabled for sets |
| | since greedy SLOT atoms could be a property of the set |
| | itself. |
| 8283 | Convert depgraph creation from using recursive calls to |
| zmedico | using a stack of dependencies which will be more suitable |
| | for implementation of backtracking. |
| 8284 | Fix inverted logic error. |
| zmedico | |
| 8285 | Make the Package class generate the digraph nodes. |
| zmedico | |
| 8286 | Spit out a depgraph._get_existing_pkg() method for getting |
| zmedico | an existing Package instance added to the graph for a given |
| | SLOT. |
| 8287 | For the global AUTOCLEAN, pass an empty list into unmerge() |
| zmedico | so it behaves like it used to. |
| 8288 | Filter atoms that come from sets when generating the list of |
| zmedico | atoms to record in the world file. |
| 8289 | If the title string is too big then xtermTitle() can |
| zmedico | misbehave by causing the terminal to echo some of the |
| | characters and generate a "beep" sound. This is easily |
| | triggered by doing things like `emerge world` now since all |
| | the the atoms are expanded. |
| 8290 | For the emergelog message, send in the original list of |
| zmedico | arguments that exists before expansion of sets. |
svn path=/main/branches/prefix/; revision=8298
Fabian Groffen [Thu, 25 Oct 2007 20:00:02 +0000 (20:00 -0000)]
Fix bug detected by mattmatteh in #gentoo-alt, the prefix version of
doins is missing the isolated-functions.sh include. This prevents
dieing on a missing vecho, instead of the real error message.
svn path=/main/branches/prefix/; revision=8297
Fabian Groffen [Wed, 24 Oct 2007 14:53:11 +0000 (14:53 -0000)]
FIX: indentation problem, also end the Portage identification line with a ) if repoman wasn't forced to do its job. Should probably be back-propagated to the trunk.
svn path=/main/branches/prefix/; revision=8281
Fabian Groffen [Wed, 24 Oct 2007 14:45:58 +0000 (14:45 -0000)]
Fix: Make repoman actually USE -m commit message again (and -M commit message file). This should probably be back propagated to the trunk as well.
svn path=/main/branches/prefix/; revision=8280
Fabian Groffen [Wed, 24 Oct 2007 14:37:10 +0000 (14:37 -0000)]
reduce diff with trunk
svn path=/main/branches/prefix/; revision=8279
Fabian Groffen [Wed, 24 Oct 2007 14:28:11 +0000 (14:28 -0000)]
python says: bin_blobs is not defined, it is right as this wasn't dealt with in the SVN case
svn path=/main/branches/prefix/; revision=8278
Fabian Groffen [Wed, 24 Oct 2007 14:21:13 +0000 (14:21 -0000)]
python says: myoptions is not defined
svn path=/main/branches/prefix/; revision=8277
Fabian Groffen [Wed, 24 Oct 2007 14:07:58 +0000 (14:07 -0000)]
It may be nice to have prefix around if the default datadir is defined on top of it.
svn path=/main/branches/prefix/; revision=8276
projects / portage.git / log