Fabian Groffen [Fri, 1 Feb 2008 19:33:43 +0000 (19:33 -0000)]
Merged from trunk 9234:9264
| 9235 | - Remove ebuild.autotools repoman check since it produces |
| zmedico | lots of false positives (bug #207104) and its hard to parse |
| | bash - Use QA_INTERCEPTORS in ebuild.sh to implement a |
| | runtime 'QA Notice' when autotools is called directly |
| 9236 | Remove the last traces of the ebuild.autotools check. |
| zmedico | |
| 9238 | * Bug #205966 - Don't show binhost password when displaying |
| zmedico | the uri. * Fix a cpv variable name typo. |
| 9241 | Add 'local' to the list of non_category_dirs since it's |
| zmedico | commonly used for layman overlays. |
| 9249 | Make the autotools.eclass functions exempt from the |
| zmedico | autotools QA Notice. |
| 9252 | Unconditionally disable manifest1 compatibility since it's |
| zmedico | been dropped from the main tree and nobody needs it anymore. |
| 9254 | Disable manifest1_compat for ebuild --force digest. |
| zmedico | |
| 9256 | Bug #205718 - Fix quoting of ${INSTALL_MASK} where |
| zmedico | appropriate. Thanks to Ed Catmur <ed@catmur.co.uk> for this |
| | patch. |
| 9258 | Make the manifest1_compat constructor parameter default to |
| zmedico | False to prevent potential interference from stale old |
| | digest files in overlays. |
| 9260 | Remove the manifest1 digest filter from PORTAGE_RSYNC_OPTS |
| zmedico | since it's no longer needed. |
| 9262 | Remove the manifest1 digest file removal code since it's no |
| zmedico | longer needed. |
| 9264 | portage-2.1.4.1 ================================== * If you |
| zmedico | have an overlay then you should remove **/files/digest-* |
| | files (Manifest1) because they are no longer supported. * If |
| | earlier versions of portage will be used to generate |
| | manifests for your overlay then you should add a file named |
| | manifest1_obsolete to the root of the repository in order to |
| | disable generation of the Manifest1 digest files. |
svn path=/main/branches/prefix/; revision=9268
Fabian Groffen [Fri, 1 Feb 2008 19:25:49 +0000 (19:25 -0000)]
First shot at storing NEEDED info for Darwin hosts. We simulate the scanelf output to the max, by stripping of (valuable) path information and storing the filenames of the dynamic libs only.
svn path=/main/branches/prefix/; revision=9267
Fabian Groffen [Wed, 30 Jan 2008 19:56:30 +0000 (19:56 -0000)]
Fix two small issues
svn path=/main/branches/prefix/; revision=9233
Fabian Groffen [Wed, 30 Jan 2008 19:45:49 +0000 (19:45 -0000)]
de-typo
svn path=/main/branches/prefix/; revision=9232
Fabian Groffen [Wed, 30 Jan 2008 19:28:08 +0000 (19:28 -0000)]
Merged from trunk 9225:9227
| 9226 | Pull more functions out of repoman proper and into |
| WarnerBro | repoman.utilities |
| 9227 | Pull more functions out of repoman proper and into |
| WarnerBro | repoman.utilities, correct a typo, clean up imports |
svn path=/main/branches/prefix/; revision=9231
Fabian Groffen [Wed, 30 Jan 2008 18:18:48 +0000 (18:18 -0000)]
Merged from trunk 9224:9225
| 9225 | import ordering, prevent errors from mucking up module |
| WarnerBro | namespace in checks, fix typo from last commit, rename 'm' |
| | to autotools_match, fix spacing between classes |
svn path=/main/branches/prefix/; revision=9229
Fabian Groffen [Wed, 30 Jan 2008 18:13:29 +0000 (18:13 -0000)]
This commit should probably be merged into the trunk.
Fix a bug in preserve libs backtracing.
Issue: copy2 raised an error because the destination path didn't exist
Cause: os.path.join was used with absolute paths on the 2nd arguments,
which results in not a join, but the 2nd argument only.
Result: the os.path.exists/makedirs was only called based on the
existing installation (x), causing no directory ever to be made in the
image dir. Because x is absolute the join always returned x, hence when
preserve libs was run for a lib in a dir not yet existing in the image
it bailed out.
I caught this issue on FreeBSD when upgrading binutils from
18.whatever.2 to 18.whatever.3, when preserve libs tried to preserve
libopcodes.18.whatever.2.so which is in a directory 18.whatever.2,
whereas only 18.whatever.3 existed.
svn path=/main/branches/prefix/; revision=9228
Fabian Groffen [Sun, 27 Jan 2008 09:37:10 +0000 (09:37 -0000)]
Merged from trunk 9219:9222
| 9220 | Bug #206772 - Enable bashrc once again for the clean |
| zmedico | phase. |
| 9221 | Move random functions out of repoman and into utilties.py |
| WarnerBro | |
| 9222 | Restore desktop.invalid as a warning; was an intergration |
| WarnerBro | error |
svn path=/main/branches/prefix/; revision=9224
Fabian Groffen [Sun, 27 Jan 2008 09:29:43 +0000 (09:29 -0000)]
Move paths to the bottom, be more dense and print ${S} as it's often necessary when a package fails
svn path=/main/branches/prefix/; revision=9223
Fabian Groffen [Mon, 21 Jan 2008 19:43:18 +0000 (19:43 -0000)]
Merged from trunk 9215:9217
| 9216 | Replace the current diefunc() and die alias with a single |
| zmedico | die() function. The previous arguments to diefunc() weren't |
| | used anyway. The result is that the die message looks better |
| | because it doesn't show the alias and all of it's arguments |
| | which are totally irrelevant. (branches/prefix r9212) |
| 9217 | We need to implement diefunc() since environment.bz2 files |
| zmedico | contain calls to it (due to alias expansion). |
svn path=/main/branches/prefix/; revision=9219
Fabian Groffen [Sun, 20 Jan 2008 21:03:57 +0000 (21:03 -0000)]
Haubi is with us now, sort by name
svn path=/main/branches/prefix/; revision=9215
Fabian Groffen [Sun, 20 Jan 2008 19:51:10 +0000 (19:51 -0000)]
Merged from trunk 9208:9209
| 9209 | Add a note that PORTDIR is a repository of software and |
| WarnerBro | that users should not add random directories in it. |
svn path=/main/branches/prefix/; revision=9214
Fabian Groffen [Sun, 20 Jan 2008 19:05:05 +0000 (19:05 -0000)]
Change the die func to produce a readable message where the actual die message isn't hidden away between many other messages that don't add much. This commit is based on my and others in #gentoo-alt their taste, so may very well not be eligable for merging in the trunk.
svn path=/main/branches/prefix/; revision=9213
Fabian Groffen [Sun, 20 Jan 2008 19:01:26 +0000 (19:01 -0000)]
Get rid of die alias to diefunc, since diefunc does nothing with the first three arguments that the die alias inserts. This commit /might/ be merged in the trunk.
svn path=/main/branches/prefix/; revision=9212
Fabian Groffen [Sun, 20 Jan 2008 18:58:37 +0000 (18:58 -0000)]
Only calculate the space (width) for functions/line numbers that are actually going to be printed in the stack. This commit is eligable for merging in the trunk.
svn path=/main/branches/prefix/; revision=9211
Fabian Groffen [Sat, 19 Jan 2008 12:44:51 +0000 (12:44 -0000)]
Add support for svn+https:// and svn:// schemes
svn path=/main/branches/prefix/; revision=9208
Fabian Groffen [Sat, 19 Jan 2008 10:46:59 +0000 (10:46 -0000)]
Merged from trunk 9205:9206
| 9206 | Check for quoted ${A}. Thanks to maekke for this patch. |
| zmedico | |
svn path=/main/branches/prefix/; revision=9207
Fabian Groffen [Sun, 13 Jan 2008 12:23:38 +0000 (12:23 -0000)]
Fix inter-revision code that apparently has never been triggered before, all comparisons were done using floats in pkgcmp...
svn path=/main/branches/prefix/; revision=9205
Fabian Groffen [Sun, 13 Jan 2008 12:04:35 +0000 (12:04 -0000)]
Fix the regexp with regard to detecting inter-revisions
svn path=/main/branches/prefix/; revision=9204
Fabian Groffen [Sun, 13 Jan 2008 11:07:32 +0000 (11:07 -0000)]
Merged from trunk 9179:9201
| 9184 | Fix a typo. |
| zmedico | |
| 9186 | Adjust the max DESCRIPTION.toolong length to 100 |
| zmedico | characters so that it's not too small and only about 3% of |
| | packages will trigger it. |
| 9188 | Bug #205318 - Handle errno.ENOTDIR thrown from the lstat |
| zmedico | call inside dblink._security_check(). |
| 9190 | Bug #203887 - Make repoman recognize |
| zmedico | RESTRICT="installsources". |
| 9192 | Replace hardcoded value with max_desc_len. |
| zmedico | |
| 9194 | In preprocess_ebuild_env(), move a |
| zmedico | filter_readonly_variables call out of a subshell since |
| | FreeBSD and prefix users have reported apparent corruption |
| | of the PATH environment variable that triggers calls to |
| | the wrong version of sed (one that does not support the -r |
| | option). An example of what users have observed: >>> |
| | Source compiled. sed: illegal option -- r usage: sed |
| | script [-Ealn] [-i extension] [file ...] sed [-Ealn] [-i |
| | extension] [-e script] ... [-f script_file] ... [file ...] |
| | Traceback (most recent call last): File |
| | "/usr/lib/portage/bin/filter-bash-environment.py", line |
| | 51, in compile_egrep_pattern(args[0]), file_in, file_out) |
| | File "/usr/lib/portage/bin/filter-bash-environment.py", |
| | line 34, in filter_bash_environment file_out.write(line) |
| | IOError: [Errno 32] Broken pipe |
| 9195 | Remove redundant return statement. |
| zmedico | |
| 9197 | Add some notes about enhancements related to binary |
| zmedico | package support that's now in 2.1.4. |
| 9200 | style fixes (imports), add support for --version (bug |
| WarnerBro | 138159) |
| 9201 | fix typo in emerge-webrsync from r9118 |
| WarnerBro | |
svn path=/main/branches/prefix/; revision=9203
Fabian Groffen [Sun, 13 Jan 2008 11:05:32 +0000 (11:05 -0000)]
Merged from trunk 9159:9179
| 9160 | Bug #162542 - When dropping privileges for |
| zmedico | FEATURES=userpriv, automatically detect permission problems |
| | with CCACHE_DIR and recursively adjust permissions only when |
| | necessary. |
| 9162 | Bug#204668 - Fix WORKDIR quoting in econf() when updating |
| zmedico | config.guess and config.sub. |
| 9163 | Bug #204425 - Remove --delete-after from the default |
| zmedico | PORTAGE_RSYNC_OPTS. This allows the rsync program to choose |
| | the preferred --delete algorithm, or the user can choose one |
| | via PORTAGE_RSYNC_EXTRA_OPTS. |
| 9164 | Make sure that portdb.findname() returns the correct ebuild. |
| zmedico | |
| 9165 | Fix the "Appending to PORTDIR_OVERLAY..." feature which was |
| zmedico | broken by the previous commit. |
| 9166 | Bug #203316 - Fix isvalidatom() to properly detect invalid |
| zmedico | operators used together with slot atoms. Thanks to Arfrever |
| | Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com> for the |
| | patch. |
| 9167 | Bug #203887 - Implement RESTRICT=installsources for binaries |
| zmedico | that are not compatible with debugedit. |
| 9176 | Bug #162450 - Try to avoid having so many bugs marked |
| zmedico | UPSTREAM by encouraging users to report 'poor programming |
| | practices' QA issues upstream and show them the $HOMEPAGE |
| | for convenience. |
| 9177 | Add a DESCRIPTION.toolong warning for when the DESCRIPTION |
| zmedico | line is over 80 characters long. Thanks to Betelgeuse for |
| | the patch. |
| 9178 | * Make pkgcmp() pass the ebuild revision directly into |
| zmedico | vercmp() since there is code there to handle it already. |
| | This eliminates some redundant revision comparison code. |
| | Thanks to peper for the patch. * Add some vercmp() test |
| | cases for comparison of ebuild revisions. |
| 9179 | Add a new "ebuild.autotools" check for when ebuilds call |
| zmedico | autotools directly instead of using autotools.eclass. Thanks |
| | to Betelgeuse for the initial patch. |
svn path=/main/branches/prefix/; revision=9202
Fabian Groffen [Tue, 8 Jan 2008 17:09:54 +0000 (17:09 -0000)]
Merged from trunk 9154:9158
| 9155 | Bug #204753 - Add "distfiles" and "packages" to the list of |
| zmedico | non-category directories. |
| 9157 | When spawing the "depend" phase, use file descriptors from |
| zmedico | sys.std* streams. |
| 9158 | After loading the environment, make sure the color variables |
| zmedico | are in sync with the current NOCOLOR setting. |
svn path=/main/branches/prefix/; revision=9159
Fabian Groffen [Mon, 7 Jan 2008 20:59:07 +0000 (20:59 -0000)]
Merged from trunk 9150:9151
| 9151 | Bug #204651 - Make repoman respect NOCOLOR=true. |
| zmedico | |
svn path=/main/branches/prefix/; revision=9154
Fabian Groffen [Mon, 7 Jan 2008 20:56:54 +0000 (20:56 -0000)]
When installing a binpkg make sure we record our own prefix, not the one of the binpkg, as we adjusted the package accordingly. (rebinpkging should work, though not really sensible)
svn path=/main/branches/prefix/; revision=9153
Fabian Groffen [Sat, 5 Jan 2008 22:34:14 +0000 (22:34 -0000)]
Merged from trunk 9143:9147
| 9144 | per bug 204468, remove old check from repoman (all ebuilds |
| WarnerBro | in gentoo-x86 are migrated). |
| 9145 | Filter PATH along with FEATURES when loading |
| zmedico | environment.bz2. |
| 9147 | Make filter_readonly_variables() filter PATH in any case |
| zmedico | since we never want to save of reload it. |
svn path=/main/branches/prefix/; revision=9150
Fabian Groffen [Sat, 5 Jan 2008 22:32:51 +0000 (22:32 -0000)]
Fix a bug where we would get a stat failure on dead symlinks. (should
have used lstat all over the place)
Optimise performance by removing two needless stat calls.
svn path=/main/branches/prefix/; revision=9149
Fabian Groffen [Sat, 5 Jan 2008 13:49:22 +0000 (13:49 -0000)]
Merged from trunk 9139:9140
| 9140 | Send eerror and ewarn messages to stderr. This is important |
| zmedico | in case somebody calls portageq inside a global scope |
| | command substitution. The output needs to go to stderr so |
| | that the die message from the subshell is visible. |
svn path=/main/branches/prefix/; revision=9143
Fabian Groffen [Sat, 5 Jan 2008 13:44:18 +0000 (13:44 -0000)]
Implemented support for restoring hardlinks in chpathtool.
svn path=/main/branches/prefix/; revision=9142
Fabian Groffen [Thu, 3 Jan 2008 18:56:57 +0000 (18:56 -0000)]
Merged from trunk 9134:9137
| 9135 | Bug #204020 - Make grabfile() properly raise |
| zmedico | PermissionDenied when appropriate instead of silently |
| | ignoring permission errors. |
| 9137 | Recognize export statements when filtering the environment. |
| zmedico | This is needed for compatibility with environment.bz2 files |
| | generated by paludis. |
svn path=/main/branches/prefix/; revision=9139
Fabian Groffen [Wed, 2 Jan 2008 11:18:26 +0000 (11:18 -0000)]
Hundreds of die messages suck and completely jungle up the terminal, and actually obstruct the cause, use a file to 'talk' between parent and sub-processes
svn path=/main/branches/prefix/; revision=9134
Fabian Groffen [Tue, 1 Jan 2008 22:06:30 +0000 (22:06 -0000)]
Python doesn't like me, and I don't like Python
svn path=/main/branches/prefix/; revision=9133
Fabian Groffen [Tue, 1 Jan 2008 21:55:01 +0000 (21:55 -0000)]
Merged from trunk 9125:9128
| 9126 | Fix config.setcpv() to properly call config.regenerate() in |
| zmedico | cases when USE needs to be regenerated due to FEATURES=test |
| | to USE=test mapping. |
| 9128 | When searching for "test" in IUSE, account for IUSE |
| zmedico | defaults. |
svn path=/main/branches/prefix/; revision=9132
Fabian Groffen [Tue, 1 Jan 2008 21:53:02 +0000 (21:53 -0000)]
Ignore relative install_names. Since it's hard to figure out what the executable would be (for a lib) we can't easily check it, and hence ignore it for now.
svn path=/main/branches/prefix/; revision=9131
Fabian Groffen [Sun, 30 Dec 2007 19:16:00 +0000 (19:16 -0000)]
Zac's USERLAND guessing yields in big problems for Prefix. Prefix users
/always/ have a GNU userland. I could reliably make this the case in
portage/data.py. In isolated-functions.sh I couldn't. It looks strange
to me it's being set there as well.
I personally hope that USERLAND can go away some day. Prefix could
cater for this in the current FreeBSD case, by simply having an
alternative EPREFIX for a number of packages that Portage needs (bash,
coreutils, findutils, sed, gawk ...).
svn path=/main/branches/prefix/; revision=9125
Fabian Groffen [Sun, 30 Dec 2007 17:19:05 +0000 (17:19 -0000)]
Merged from trunk 9094:9118
| 9096 | Move XARGS initialization from portage.data to |
| zmedico | isolated-functions.sh. |
| 9097 | Move XARGS initialization from portage.data to |
| zmedico | isolated-functions.sh. |
| 9099 | Remove redundant lchown() compatibility code since the |
| zmedico | getattr(os, "lchown", None) call already handles it. |
| 9100 | Simplify the userland detection code in portage.data and add |
| zmedico | a bash version of it to isolated-functions.sh. |
| 9101 | Add back support for silent definition of the dummy lchown() |
| zmedico | function when ostype == Darwin. |
| 9103 | Remove redundant USERLAND sanity check code from doebuild() |
| zmedico | since it's handled in isolated-functions.sh now. |
| 9105 | Make the global counter file correspond to the total number |
| zmedico | of installation actions that have occurred in the history of |
| | this package database. |
| 9107 | Rely on USERLAND since it's automatically generated by |
| zmedico | isolated-functions.sh when necessary. |
| 9109 | Document that docinto works for dohtml. |
| zmedico | |
| 9111 | Make the ecompressdir vecho output show a leading / on the |
| zmedico | directory path. Thanks to armin76. |
| 9112 | Fix handling of leading / charactes some more. |
| zmedico | |
| 9114 | Add PKGDIR to the config.environ() whitelist so that |
| zmedico | people's bashrc's don't break. |
| 9116 | Fix broken Darwin USERLAND detection. |
| zmedico | |
| 9117 | Fix USERLAND references to handle Darwin like BSD. |
| zmedico | |
| 9118 | As suggested by grobian, treat Darwin just like USERLAND=gnu |
| zmedico | since they seem to be switching commands to gnu anyway. |
svn path=/main/branches/prefix/; revision=9124
Fabian Groffen [Sun, 30 Dec 2007 17:08:29 +0000 (17:08 -0000)]
Merged from trunk 9063:9094
| 9064 | Fixes for logic related to FEATURES=test to USE=test |
| zmedico | mapping: * Add EBUILD_FORCE_TEST to the environment |
| | whitelist and filter it from the saved environment in |
| | save_ebuild_env(). * Tweak logic inside the ebuild command |
| | and config.regenerate() so that EBUILD_FORCE_TEST works even |
| | in odd cases like when USE=test is masked. * Only make |
| | FEATURES=test map to USE=test when "test" is actually in |
| | IUSE. * Remove USE=test from the set of implicit IUSE so |
| | that useq() calls in ebuild.sh properly generate a QA Notice |
| | when "test" is missing from IUSE. |
| 9065 | Show the EBUILD_FORCE_TEST "Forcing test" message even when |
| zmedico | "test" is not in IUSE. |
| 9066 | In action_regen(), use writemsg() to send error messages to |
| zmedico | stderr. |
| 9078 | Just ignore it when the global counter file does not match |
| zmedico | the highest installed COUNTER since it's normal for them to |
| | differ in some cases. For example, the global counter file |
| | will contain a higher value if the user merges a package and |
| | then immediately unmerges it (unmerge does not update the |
| | global counter file, but merge does). |
| 9080 | Make dep_expand() stop relying on having a categories list: |
| zmedico | * Create and use a dbapi.categories property that is |
| | automatically generated from dbapi.cp_all(). * Make mutable |
| | dbapi instances delete the invalidate the cached categories |
| | when they need to be regenerated. |
| 9081 | Make key_expand() use dbapi.categories. |
| zmedico | |
| 9083 | Make the FEATURES=sfperms loops safe for whitespace in paths |
| zmedico | by using find -print0 | while read -d $'\0'. |
| 9085 | Bug #202697 - Add / to the default initial SANDBOX_READ in |
| zmedico | order to avoid a situation where attempts to read arbitrary |
| | files trigger sandbox violations. |
| 9087 | Bug #121584 - Make the automatic USERLAND detection code |
| zmedico | recognize GNU/kFreeBSD. |
| 9089 | Make the ARCH and USERLAND sanity check use the autodetected |
| zmedico | USERLAND from the portage.data module if necessary. |
| 9090 | Make doebuild() check XARGS together with ARCH and USERLAND. |
| zmedico | |
| 9092 | * Initialize dbapi._categories = None so that we can compare |
| zmedico | with None instead of using hasattr. * Remove unwanted |
| | self._categories initialization from the portdbapi |
| | constructor. |
| 9094 | Add support for showing binary package file sizes in emerge |
| zmedico | --search output. |
svn path=/main/branches/prefix/; revision=9123
Fabian Groffen [Sun, 30 Dec 2007 16:39:41 +0000 (16:39 -0000)]
Add some more missing man-pages, and sort the list.
svn path=/main/branches/prefix/; revision=9122
Fabian Groffen [Sun, 30 Dec 2007 16:37:54 +0000 (16:37 -0000)]
Also install this manpage :(
svn path=/main/branches/prefix/; revision=9121
Fabian Groffen [Sun, 30 Dec 2007 16:33:01 +0000 (16:33 -0000)]
Because pipping doesn't understand C-code, I wrote a man-page for chpathtool so he can also understand what the tool does (try to accomplish)
svn path=/main/branches/prefix/; revision=9120
Fabian Groffen [Fri, 28 Dec 2007 13:39:30 +0000 (13:39 -0000)]
Merged from trunk 9058:9062
| 9059 | Bug #201498 - Use desktop-file-validate to validate |
| zmedico | *.desktop files inside ${FILESDIR} and generate a |
| | "desktop.invalid" qa warning if an error is detected. Thanks |
| | to Betelgeuse for the initial patch. |
| 9060 | Minor code readablity enhancements: * Use relative_path and |
| zmedico | full_path variables for files being checked instead of |
| | spreading code like x+"/files/"+y all over the place. * Use |
| | stat.S_IMODE with octal 0111 instead of hex 0x0248 in the |
| | file.executable checks. |
| 9061 | Bug #203323 - Fix the FEATURES=sfperms code so that it |
| zmedico | doesn't chmod g-r on binaries that are both setuid and |
| | setgid. In that case, just chmod o-r. |
| 9062 | Always make sure that the depend phase triggers a source |
| zmedico | ${EBUILD} call, even if "${T}"/environment happens to exist |
| | for some reason. |
svn path=/main/branches/prefix/; revision=9063
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
projects / portage.git / log