Fabian Groffen [Sun, 15 Apr 2007 11:11:01 +0000 (11:11 -0000)]
Being consistent-style-picky here on vapier's commit.
svn path=/main/branches/prefix/; revision=6413
Fabian Groffen [Sun, 15 Apr 2007 11:06:29 +0000 (11:06 -0000)]
Merged from trunk 6410:6411
+------------------------------------------------------------------------+
| 6411 | convert `type -p` to `type -P` as noted by grobian |
| SpankMan | |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6412
Fabian Groffen [Sat, 14 Apr 2007 20:14:12 +0000 (20:14 -0000)]
Clean up.
svn path=/main/branches/prefix/; revision=6410
Fabian Groffen [Sat, 14 Apr 2007 20:04:32 +0000 (20:04 -0000)]
Merged from trunk 6400:6403
+------------------------------------------------------------------------+
| 6401 | revise tests so that `insinto /` does not trigger an error |
| SpankMan | (prefix: add $EPREFIX test) |
|----------+-------------------------------------------------------------|
| 6402 | queue compression |
| SpankMan | |
|----------+-------------------------------------------------------------|
| 6403 | do stripping after compression dequeueing |
| SpankMan | |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6409
Fabian Groffen [Sat, 14 Apr 2007 20:02:05 +0000 (20:02 -0000)]
Style. (c) Mike.
svn path=/main/branches/prefix/; revision=6408
Fabian Groffen [Sat, 14 Apr 2007 20:00:02 +0000 (20:00 -0000)]
Make Mike happy and do a real path-search.
svn path=/main/branches/prefix/; revision=6407
Fabian Groffen [Sat, 14 Apr 2007 19:43:45 +0000 (19:43 -0000)]
Change logic to always use deb2targz if deb2targz is available, and fall
back on ar if unavailable. This avoids some CHOST logic, which I don't
really get (yet).
svn path=/main/branches/prefix/; revision=6406
Fabian Groffen [Sat, 14 Apr 2007 08:50:39 +0000 (08:50 -0000)]
Make misc-functions safe for paths/files with spaces in them.
svn path=/main/branches/prefix/; revision=6400
Fabian Groffen [Sat, 14 Apr 2007 07:56:43 +0000 (07:56 -0000)]
Merged from trunk 6382:6397
+------------------------------------------------------------------------+
| 6383 | Use a config instance that's not locked/immutable. |
| zmedico | |
|----------+-------------------------------------------------------------|
| 6384 | Use catpkgsplit instead of pkgsplit for consistency with |
| zmedico | usage elsewhere. |
|----------+-------------------------------------------------------------|
| 6386 | Add CATEGORY to blacklisted variables since it can |
| zmedico | interfere with CATEGORY guessing inside doebuild. |
|----------+-------------------------------------------------------------|
| 6388 | Use relative paths inside ecompressdir in order to avoid |
| zmedico | 'Argument list too long' errors with large file sets |
| | (observed when installing sys-apps/man-pages). |
|----------+-------------------------------------------------------------|
| 6392 | simplify unsafe file checking so files/paths with spaces |
| SpankMan | dont cause troubles |
|----------+-------------------------------------------------------------|
| 6394 | create leading directories to match behavior of other do* |
| SpankMan | programs |
|----------+-------------------------------------------------------------|
| 6395 | document new version suffix style #166522 |
| SpankMan | |
|----------+-------------------------------------------------------------|
| 6396 | Prefix the hardlink source with ${D} like we always have. |
| zmedico | |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6399
Fabian Groffen [Fri, 13 Apr 2007 13:05:37 +0000 (13:05 -0000)]
Apparently the combination of SVN and me messed up some changes that
should have been properly propagated.
svn path=/main/branches/prefix/; revision=6391
Fabian Groffen [Fri, 13 Apr 2007 12:58:20 +0000 (12:58 -0000)]
Remove home-made functions; they are not in the trunk, and the added
value is another difference between mainline and prefix.
svn path=/main/branches/prefix/; revision=6390
Fabian Groffen [Thu, 12 Apr 2007 17:17:48 +0000 (17:17 -0000)]
On AIX, we don't use GNU binutils ar, and the ar out there isn't
compatible as well (like odcctools' one), so we have to resort to using
deb2targz on that platform.
svn path=/main/branches/prefix/; revision=6381
Fabian Groffen [Thu, 12 Apr 2007 13:18:12 +0000 (13:18 -0000)]
Merged from trunk 6378:6379
+------------------------------------------------------------------------+
| 6379 | cleanup example ebuild to be more representative of a |
| SpankMan | "good" ebuild #174260 by Timothy Redaelli |
+------------------------------------------------------------------------+
(I'm somehow not convinced this example is completely correct...)
svn path=/main/branches/prefix/; revision=6380
Fabian Groffen [Thu, 12 Apr 2007 10:42:57 +0000 (10:42 -0000)]
Merged from trunk 6370:6371
+------------------------------------------------------------------------+
| 6371 | For bug #173808, add back the old heuristics to make sure |
| zmedico | that we don't just blindly compress the contents of any |
| | directory named "man". |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6378
Fabian Groffen [Thu, 12 Apr 2007 10:38:59 +0000 (10:38 -0000)]
Quote regexp, by Michael Haubenwallner
svn path=/main/branches/prefix/; revision=6377
Fabian Groffen [Tue, 10 Apr 2007 16:03:57 +0000 (16:03 -0000)]
More portage_const -> portage.const. This has obviously never been
tried before.
svn path=/main/branches/prefix/; revision=6370
Fabian Groffen [Tue, 10 Apr 2007 15:53:15 +0000 (15:53 -0000)]
Funk and Fix it up a bit.
svn path=/main/branches/prefix/; revision=6369
Fabian Groffen [Tue, 10 Apr 2007 15:47:43 +0000 (15:47 -0000)]
Merged from trunk 6353:6362
+------------------------------------------------------------------------+
| 6354 | Only apply permissions to ccache, confcache, and distcc dirs |
| zmedico | when they are created in order to avoid interference with |
| | whatever the user's preferred permissions are. Thanks to |
| | Diego Pettenò <flameeyes@gmail.com> for reporting. |
|---------+--------------------------------------------------------------|
| 6356 | Cache NEEDED in order to optimize update_library_map() |
| zmedico | calls. |
|---------+--------------------------------------------------------------|
| 6357 | Update the FEATURES=strict docs for better clarity. Thanks |
| zmedico | to taviso for reporting. |
|---------+--------------------------------------------------------------|
| 6358 | Don't load FEATURES in load_infodir() because FEATURES from |
| zmedico | the build host shouldn't be interpreted asFEATURES on the |
| | client system. Thanks to Thanks to Chri |
|---------+--------------------------------------------------------------|
| 6360 | Efficiently recycle partial valid vdb cache when possible. |
| zmedico | This reduces disk load when switching between versions of |
| | portage that cache different keys. |
|---------+--------------------------------------------------------------|
| 6362 | For bug #173808, compress ${mandir} all in one go instead of |
| zmedico | doing subdirectories separately. This allows symlinks that |
| | point into sibling directories to get updated properly be |
| | ecompressdir. |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6368
Fabian Groffen [Tue, 10 Apr 2007 15:44:16 +0000 (15:44 -0000)]
A bit too much of spaces to tabs.
svn path=/main/branches/prefix/; revision=6367
Fabian Groffen [Tue, 10 Apr 2007 15:41:24 +0000 (15:41 -0000)]
portage_const -> portage.const
svn path=/main/branches/prefix/; revision=6366
Fabian Groffen [Tue, 10 Apr 2007 15:34:22 +0000 (15:34 -0000)]
" " -> "\t"
Mixing them in Python is asking for trouble. In fact, even Python
didn't know what to do with this file anymore.
svn path=/main/branches/prefix/; revision=6365
Fabian Groffen [Tue, 10 Apr 2007 15:33:28 +0000 (15:33 -0000)]
Also check python files in bin/
svn path=/main/branches/prefix/; revision=6364
Fabian Groffen [Sat, 7 Apr 2007 11:47:30 +0000 (11:47 -0000)]
Fix non-prefixness from previous commit
svn path=/main/branches/prefix/; revision=6353
Fabian Groffen [Sat, 7 Apr 2007 11:44:54 +0000 (11:44 -0000)]
Merged from trunk 6345:6351
+------------------------------------------------------------------------+
| 6346 | remove references to DOCDESTTREE and INSDESTTREE |
| SpankMan | |
|----------+-------------------------------------------------------------|
| 6347 | change "DOCDESTTREE" to "_E_DOCDESTTREE_" to try and |
| SpankMan | prevent abuse from ebuild writers |
|----------+-------------------------------------------------------------|
| 6348 | tell people that the FILES section is not supposed to be |
| SpankMan | complete (and sneak in a few style fixups) |
|----------+-------------------------------------------------------------|
| 6349 | document /var/cache/edb/, /var/db/pkg/, and |
| SpankMan | /var/lib/portage/config |
|----------+-------------------------------------------------------------|
| 6350 | remove references to EXEDESTTREE |
| SpankMan | |
|----------+-------------------------------------------------------------|
| 6351 | change "EXEDESTTREE" to "_E_EXEDESTTREE_" to try and |
| SpankMan | prevent abuse from ebuild writers |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6352
Fabian Groffen [Fri, 6 Apr 2007 17:45:10 +0000 (17:45 -0000)]
Merged from trunk 6338:6344
(Do the changes I did yesterday again, but then the right way)
+------------------------------------------------------------------------+
| 6339 | Punt the sorted_versions() function in favor of |
| zmedico | list.sort(vercmp). |
|---------+--------------------------------------------------------------|
| 6341 | Don't set os.environ["USERLAND"] inside portage.data and |
| zmedico | rely on USERLAND from the profile instead (bail out if |
| | necessary when USERLAND is unset). |
|---------+--------------------------------------------------------------|
| 6342 | Don't force OS detection in the portage.data module. |
| zmedico | |
|---------+--------------------------------------------------------------|
| 6343 | Make sure XARGS has a default value. |
| zmedico | |
|---------+--------------------------------------------------------------|
| 6344 | Provide a default value to the getattr call. |
| zmedico | |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6345
Fabian Groffen [Thu, 5 Apr 2007 20:14:39 +0000 (20:14 -0000)]
portage/__init__ includes userland from portage/data. It doesn't use
it, so we just define it, and set the value to something stupid.
svn path=/main/branches/prefix/; revision=6338
Fabian Groffen [Thu, 5 Apr 2007 20:00:18 +0000 (20:00 -0000)]
Completely remove USERLAND setting. For some reason yet unknown to me
python thinks userland="", and the profiles can do this much better than
I can in python.
svn path=/main/branches/prefix/; revision=6337
Fabian Groffen [Thu, 5 Apr 2007 16:19:46 +0000 (16:19 -0000)]
Get rid of userland madness. The default userland is "GNU", and only
BSD-ish things in non-prefix have a userland "BSD".
svn path=/main/branches/prefix/; revision=6336
Fabian Groffen [Thu, 5 Apr 2007 16:12:42 +0000 (16:12 -0000)]
As Michael Haubenwallner pointed out, in interrevisions, 01.1 should be
less than 01.10, which it is not if you interpret it as a float.
Instead pick the both components as separate integer values and compare
the sub-part if the main part is equal.
Fix crash in emerge --info that occurs if an interrevision package is
emerged which is listed. As far as I am aware this the cast to an int
is pointless here (pym/emerge/__init__.py) as it is processed as string
in portage.vercmp anyway.
svn path=/main/branches/prefix/; revision=6335
Fabian Groffen [Thu, 5 Apr 2007 15:38:52 +0000 (15:38 -0000)]
Merged from trunk 6327:6332
+------------------------------------------------------------------------+
| 6328 | After talking to marienz, decide that 1 class is better |
| WarnerBro | than 4, also realize that UserDict has most of the dict |
| | methods exposed, so drop them. Also add a LoaderError |
| | Exception. Still to do? add a validation callable into the |
| | loader to validate data. |
|-----------+------------------------------------------------------------|
| 6329 | drop line_count in favor of izip and count(), itertools |
| WarnerBro | FOR THE WIN baby. |
|-----------+------------------------------------------------------------|
| 6330 | I consulted the python oracle and it told me enumerate was |
| WarnerBro | better, so go team enumerate |
|-----------+------------------------------------------------------------|
| 6332 | For bug #173184, handle the CommandNotFound that is |
| zmedico | produced during uninstallation of prelink. |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6334
Fabian Groffen [Sat, 31 Mar 2007 11:15:41 +0000 (11:15 -0000)]
Merged from trunk 6320:6325
+------------------------------------------------------------------------+
| 6321 | For bug #172571, use socket.AF_INET as the default family |
| zmedico | for socket.getaddrinfo(). |
|----------+-------------------------------------------------------------|
| 6324 | make PDEPEND wording less restrictive #172511 and clarify |
| SpankMan | install status wrt ||() as noted by ferringb |
|----------+-------------------------------------------------------------|
| 6325 | Fix missing import. |
| zmedico | |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6327
Fabian Groffen [Wed, 28 Mar 2007 20:17:15 +0000 (20:17 -0000)]
Merged from trunk 6316:6318
+------------------------------------------------------------------------+
| 6317 | spaces -> tabs |
| zmedico | |
|---------+--------------------------------------------------------------|
| 6318 | spaces -> tabs |
| zmedico | |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6320
Fabian Groffen [Wed, 28 Mar 2007 20:14:13 +0000 (20:14 -0000)]
Apparently some vital source has gotten lost somewhere. A vimdiff also
revealed some other differences with the trunk that are now eliminated.
svn path=/main/branches/prefix/; revision=6319
Fabian Groffen [Wed, 28 Mar 2007 19:39:38 +0000 (19:39 -0000)]
Cleanup a bit.
svn path=/main/branches/prefix/; revision=6316
Fabian Groffen [Wed, 28 Mar 2007 19:35:07 +0000 (19:35 -0000)]
Adding this script because .... well... we love open source and stuff.
A little script to turn an SVN range (revision1:revision2) into a
"Merged from trunk" message, used when merging changes from the trunk
into the prefix branch.
svn path=/main/branches/prefix/; revision=6315
Fabian Groffen [Wed, 28 Mar 2007 19:32:02 +0000 (19:32 -0000)]
Merged from trunk 6308:6309
+------------------------------------------------------------------------+
| 6309 | For bug #172539, fix ecompressdir suffix handling so that |
| zmedico | automatic decompression of Z, gz, and bz2 suffixes works |
| | properly. |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6314
Fabian Groffen [Wed, 28 Mar 2007 19:26:57 +0000 (19:26 -0000)]
Merged from trunk 6291:6307
+------------------------------------------------------------------------+
| 6291 | minor name changes for bin tests, svn propset keywords Id |
| WarnerBro | stuff |
|-----------+------------------------------------------------------------|
| 6292 | Continue to support profile masking at least until bug |
| zmedico | #170697 is settled. |
|-----------+------------------------------------------------------------|
| 6297 | source ${T}/environment before the definition of |
| zmedico | qa_source() and qa_call() so that the call stack shows the |
| | original files and line numbers instead of those from |
| | ${T}/environment. Thanks to Markus Ullmann |
| | <jokey@gentoo.org> for reporting. |
|-----------+------------------------------------------------------------|
| 6299 | Filter the readonly attribute from variables saved in |
| zmedico | ${T}/environment to prevent 'readonly variable' error |
| | messages in later phases. |
|-----------+------------------------------------------------------------|
| 6301 | Properly anchor sed regexp for readlonly attribut |
| zmedico | filtering. |
|-----------+------------------------------------------------------------|
| 6303 | Synchronize PORTAGE_COMPRESS_FLAGS to reflect that -9 is |
| zmedico | the default now. |
|-----------+------------------------------------------------------------|
| 6305 | Convert "ebuild" and "binary" "nomerge" nodes into |
| zmedico | "installed" nodes for greater consistency in the depgraph. |
|-----------+------------------------------------------------------------|
| 6307 | Correctly pull the metadata again when the node is |
| zmedico | converted. |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6313
Fabian Groffen [Wed, 28 Mar 2007 19:20:08 +0000 (19:20 -0000)]
Merged from trunk 6278:6291
+------------------------------------------------------------------------+
| 6279 | Fix the rest of the tests |
| WarnerBro | |
|-----------+------------------------------------------------------------|
| 6280 | completely rewrite file bits, use Loader classes to push |
| WarnerBro | loading functionality down |
|-----------+------------------------------------------------------------|
| 6281 | split the loader classes into their own file, split the |
| WarnerBro | recursive filename grabbing out into it's own function |
|-----------+------------------------------------------------------------|
| 6282 | Do the "*" check as early as possible in |
| zmedico | config.getMissingLicenses(). |
|-----------+------------------------------------------------------------|
| 6283 | Verify the Manifest first even if there's only one package |
| zmedico | (prior to the fetch phase). |
|-----------+------------------------------------------------------------|
| 6285 | fix grammar in error output |
| SpankMan | |
|-----------+------------------------------------------------------------|
| 6286 | Fix insecure tempfile usage |
| WarnerBro | |
|-----------+------------------------------------------------------------|
| 6287 | fix some tests, break others |
| WarnerBro | |
|-----------+------------------------------------------------------------|
| 6288 | clean up some init functions, add PortageModules class |
| WarnerBro | |
|-----------+------------------------------------------------------------|
| 6289 | fix tests for PortageModulesFile |
| WarnerBro | |
|-----------+------------------------------------------------------------|
| 6290 | fix broken PortageModule classes |
| WarnerBro | |
|-----------+------------------------------------------------------------|
| 6291 | minor name changes for bin tests, svn propset keywords Id |
| WarnerBro | stuff |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6312
Fabian Groffen [Wed, 28 Mar 2007 19:17:18 +0000 (19:17 -0000)]
Merged from trunk 6262:6277
+------------------------------------------------------------------------+
| 6263 | default --help should be usable, so make the extended |
| SpankMan | output require --verbose |
|----------+-------------------------------------------------------------|
| 6264 | Add --verbose to the "for more help" message. |
| zmedico | |
|----------+-------------------------------------------------------------|
| 6265 | Ignore non-existent directories for bug #171809. This is |
| zmedico | required for readonly mode. |
|----------+-------------------------------------------------------------|
| 6267 | For bug #171840, consider all choices for slot intersection |
| zmedico | and promote those that have upgrades relative to other |
| | choices. |
|----------+-------------------------------------------------------------|
| 6269 | Clean up and simplify preference selection logic for bug |
| zmedico | #171840. |
|----------+-------------------------------------------------------------|
| 6271 | For bug #172033, remove the obsolete QA Notice for man |
| zmedico | pages that are already compressed. |
|----------+-------------------------------------------------------------|
| 6273 | Allow the merge task to continue despite conflicts when |
| zmedico | --fetch-all-uri is specified. |
|----------+-------------------------------------------------------------|
| 6275 | return from the merge task instead of calling sys.exit |
| zmedico | directly. |
|----------+-------------------------------------------------------------|
| 6277 | Verify all ebuild manifests before building anything now so |
| zmedico | that the user is notified of failure as soon as possible. |
+------------------------------------------------------------------------+
svn path=/main/branches/prefix/; revision=6311
Fabian Groffen [Wed, 21 Mar 2007 21:20:25 +0000 (21:20 -0000)]
Merged from trunk 6257:6261
Catch a potential InvalidDependString exception.
Add a docstring to config.getMissingLicenses().
Pass a list of USE flags into config.getMissingLicenses() so that the
method can eventually be used for binary packages in addition to ebuilds.
Fix a typo.
svn path=/main/branches/prefix/; revision=6262
Fabian Groffen [Tue, 20 Mar 2007 21:05:05 +0000 (21:05 -0000)]
Merged from trunk 6254:6256
Pass missing acceptable_licenses parameter into recursive
_getMissingLicenses() calls.
Fix cvstree import to avoid deprecation warning.
svn path=/main/branches/prefix/; revision=6257
Fabian Groffen [Tue, 20 Mar 2007 20:02:52 +0000 (20:02 -0000)]
Merged from trunk 6252:6253
Appropriately return from _getMissingLicenses() if one of the choices is
satisfied.
svn path=/main/branches/prefix/; revision=6254
Fabian Groffen [Tue, 20 Mar 2007 19:44:21 +0000 (19:44 -0000)]
Merged from trunk 6250:6251
Implement license visibility filtering for GLEP 23, bug #17367, and bug
#152593.
svn path=/main/branches/prefix/; revision=6252
Fabian Groffen [Tue, 20 Mar 2007 08:32:30 +0000 (08:32 -0000)]
Also backup EPREFIX and EROOT, such that we can use those variables in
e.g. pkg_config().
svn path=/main/branches/prefix/; revision=6250
Fabian Groffen [Tue, 20 Mar 2007 08:00:00 +0000 (08:00 -0000)]
- use python from the path, as the system python might be kind of "old"
- if you use /bin/sh, then also only use /bin/sh syntax
svn path=/main/branches/prefix/; revision=6249
Fabian Groffen [Sun, 18 Mar 2007 21:30:15 +0000 (21:30 -0000)]
Merged from trunk 6245:6247
Appropriately use globals() instead of locals() as suggested by marienz.
Revert fowners/fperms hack, as it was almost as broken as SpankMan's
commit.
svn path=/main/branches/prefix/; revision=6248
Fabian Groffen [Sun, 18 Mar 2007 12:00:20 +0000 (12:00 -0000)]
After Spanky's change, also the mode would get prefixed with ${ED},
which chmod or chown obviously doesn't grok. Since the manpages suggest
the mode should come first, we just take the first argument separate,
and leave it alone.
- if it isn't set, chmod/chown will bail out
- if it has spaces, we properly pass it through, up to chmod/chown to
decide what to do
- if it is a filename, chmod/chown will bail out for sure
svn path=/main/branches/prefix/; revision=6245
Fabian Groffen [Sun, 18 Mar 2007 11:57:09 +0000 (11:57 -0000)]
Don't check dylibs for symlinks, as there are no linker scripts on
Darwin and symlinks are used instead.
svn path=/main/branches/prefix/; revision=6244
Fabian Groffen [Sun, 18 Mar 2007 11:08:11 +0000 (11:08 -0000)]
Merged from trunk 6239:6242
make sure we prefix all arguments with $D, including ones that dont
start with a / (SpankMan)
Use locals() instead of setattr to insert generated functions into the
current module. Thanks to Brian Harring for the suggestion.
Never use listdir with both recursion=True and followSymlinks=True since
it circular symlinks will lead to endless recursion loops. Thanks to
Tobias Hahn <tobhahn@web.de> for this patch.
svn path=/main/branches/prefix/; revision=6243
Fabian Groffen [Sat, 17 Mar 2007 18:06:15 +0000 (18:06 -0000)]
When using SVN and not signing, commit the Manifest on the first commit,
because the headers won't change, so it's faster... way faster.
svn path=/main/branches/prefix/; revision=6239
Fabian Groffen [Sat, 17 Mar 2007 14:49:53 +0000 (14:49 -0000)]
Merged from trunk 6229:6234 (probably not prefix aware)
start of framework for programs in portage bin (SpankMan)
Close /dev/null when finished.
Make paths independent of cwd.
Add "bin" to testDirs.
Call the base class destructor if it exists.
svn path=/main/branches/prefix/; revision=6238
Fabian Groffen [Sat, 17 Mar 2007 14:36:40 +0000 (14:36 -0000)]
Merged from trunk 6221:6229
Fix a typo.
Fix broken exception handling.
Fix a broken test.
ignore *.py[co] (SpankMan)
Use mkstemp to create a random tempfile.
fix for older python who have oddly named __exc_info() (WarnerBro)
bump ________foo from the TestCase class since _exc_info() doesn't do
anything anyway (WarnerBro)
send stdout to /dev/null since we rely on the output of stdout here to
determine the proper suffix #171212 (SpankMan)
svn path=/main/branches/prefix/; revision=6237
Fabian Groffen [Sat, 17 Mar 2007 14:32:58 +0000 (14:32 -0000)]
Merged from trunk 6218:6221
drop the need for the force flag by default and just delete the existing
files automatically #171007 (SpankMan)
redo compression so that it is queued up in src_install and then
dequeued post src_install (SpankMan)
forcibly break all hard links so we dont need to rely on --force in
compressor and tweak the _relocate_skip_dirs() func to handle whitespace
in paths (thanks to zmedico for tip) (SpankMan)
svn path=/main/branches/prefix/; revision=6236
Fabian Groffen [Sat, 17 Mar 2007 14:22:40 +0000 (14:22 -0000)]
Merged from trunk 6209:6217
Automatically convert ROOT and PORTAGE_CONFIGROOT to absolute paths when
necessary since relative paths lead to problems. Thanks to Christian
Heim <phreak@gentoo.org> for reporting.
Add back rstrip(os.path.sep) from the previous commit since it's needed
when ROOT="/".
For bug #163262 and conformance with section 7.2 of the PMS, make the
export attribute of variables persist between ebuild phases.
For bug #171117, ensure that the new and old config have different
timestamps (for the benefit of programs like rsync that need
distiguishable timestamps to detect file changes). Thanks to Ben
Bennett <sink@limey.net> for reporting.
Fix a utime call to prevent a timestamp collision for bug #171117.
svn path=/main/branches/prefix/; revision=6235
Fabian Groffen [Thu, 15 Mar 2007 20:08:12 +0000 (20:08 -0000)]
Fix config protect from being broken in prefix: a prefix got lost here
when trying to follow genone's code moving I guess.
svn path=/main/branches/prefix/; revision=6209
Fabian Groffen [Thu, 15 Mar 2007 18:51:17 +0000 (18:51 -0000)]
Tidy up dylib QA check; aggregate found files, and check the .so files
we found are really Mach-O objects. We do this, because portage
installs dolib.so, which is just a script.
svn path=/main/branches/prefix/; revision=6208
Fabian Groffen [Wed, 14 Mar 2007 18:02:04 +0000 (18:02 -0000)]
Merged from trunk 6204:6205
Make prepinfo remove installed info indexes recursively. Thanks to
Christian Faulhammer <opfer@gentoo.org> for reporting (see bugs #162675
and #170133).
svn path=/main/branches/prefix/; revision=6207
Fabian Groffen [Sat, 10 Mar 2007 20:07:46 +0000 (20:07 -0000)]
Merged from trunk 620{0,3}
Add back a missing `source isolated-functions.sh`. The color logic is
handled internally.
import portage.xpak to avoid deprecation warning
For bug #170178, remove all hardcoded references to '/usr/lib/portage'.
svn path=/main/branches/prefix/; revision=6204
Fabian Groffen [Fri, 9 Mar 2007 11:23:18 +0000 (11:23 -0000)]
Merged from trunk 6185:6199
For bug #169620, in --tree display always show the dowload size on the
node that is "ordered" rather than one of it's "nomerge" counterparts.
Fix 2 more types.InstanceType comparisons that are broken by the
transition of dbapi to new-style classes.
Take marien's advice, turn Skips into Todos for clarity sake
Part of my attempt now involves cleaning up config; this means for me;
removing the file-based stuff from it (config_path) and encapsulating
that into classes. This is the first one, a simple PackageKeywords
class that does file-based stuff, no recursion yet but soon. Trying to
do TDD here as well,so tests first then code.
Change load() to have no default arguments, makes caller specifiy
explicitly...I think assuming a default arg is bad here. Also add
PackageUse and PackageUseFile, change up the comments a bit. I've
started to notice code re-use here; these are basically the same
code. I think I will write up the rest of the package* classes and
then perform code merges to save LOC and memory and whatnot
add PackageMask{File} classes, change unit tests to use try/finally,
makes sure the tempfile gets destroyed even if something weird
happens
whoopse, s/;/:/ (WarnerBro)
Remove legacy "masked by: profile" support as per bug #149508.
Profiles should use package.mask to mask unwanted versions of system
packages.
Use the full atoms from the system set, since profile masking does
not automatically constrain the matches anymore.
Remove the "masked by: profile" support from getmaskingstatus().
Remove profile masking of system packages from the docs.
Display message about --buildpkgonly restriction in pretend mode as
well
svn path=/main/branches/prefix/; revision=6200
Fabian Groffen [Tue, 6 Mar 2007 15:44:03 +0000 (15:44 -0000)]
Don't blindly rely on the "character position" of the data we need,
because in locales other than C this makes completely no sense. Instead
(because my python skills are far from good) split on the colon and take
the righthand side.
svn path=/main/branches/prefix/; revision=6185
Fabian Groffen [Tue, 6 Mar 2007 09:12:30 +0000 (09:12 -0000)]
Merged from trunk 6180:6183
Roll our own unittest framework to add skip support. (WarnerBro)
Update all the unittests to use the new framework, test skipping with
isValidAtom, add silly xpak test since I have it 'done' (WarnerBro)
Add part about new framework and skipping to test notes (WarnerBro)
svn path=/main/branches/prefix/; revision=6184
Fabian Groffen [Mon, 5 Mar 2007 21:50:20 +0000 (21:50 -0000)]
Merged from trunk 6173:6178
allow people to disable compression by setting the PORTAGE_COMPRESS
variables to "" (SpankMan)
Avoid pointless population of the binary tree when --buildpkg is
enabled. Thanks to vapier for reporting.
these will fail now (WarnerBro)
svn path=/main/branches/prefix/; revision=6180
Fabian Groffen [Mon, 5 Mar 2007 21:41:29 +0000 (21:41 -0000)]
Just rely on the PATH. This should be fine, and avoids ugly EPREFIX
stuff all the time. Solves bug when the tools are just not exactly in
the location they were hardcoded to be.
svn path=/main/branches/prefix/; revision=6179
Fabian Groffen [Sun, 4 Mar 2007 15:07:17 +0000 (15:07 -0000)]
Widen the search, as soon as we see $D inside $ED we bail out. We don't
have to check for $D in $D, because everything in $D that is not also in
$ED causes an emergency breakdown anyway.
svn path=/main/branches/prefix/; revision=6173
Fabian Groffen [Sun, 4 Mar 2007 15:04:17 +0000 (15:04 -0000)]
Merged from trunk 6152:6169
you can't insert into sys.path without importing sys... (WarnerBro)
In the same vein as copyright, add Id and svn:keywords to it (WarnerBro)
make sure uid is an int (WarnerBro)
Pass waiting_msg into recursive lockfile() calls.
Only prune duplicate consecutive nodes if they both have depth == 0.
For bug #169187, make --depclean prune unneeded slots such that it is
consistent with the world update algorithm.
Add a note about --with-bdeps in the --depclean failure message.
Fix the minimum index for pruning consecutive duplicate nodes.
Remove the KVERS environment variable since it's code that creates it is
broken anyway (only sets KVERS="." in the general case).
Display blockers at the end of the list so that it will more often be
easy for the user to see them in a terminal. Thanks to iapitus and
hydrogen for the suggestion.
svn path=/main/branches/prefix/; revision=6172
Fabian Groffen [Sat, 3 Mar 2007 15:49:41 +0000 (15:49 -0000)]
It makes sense to first import sys, before using it. If this patch in
itself makes sense, I don't know. At least it allows people to use
emerge.
svn path=/main/branches/prefix/; revision=6152
Fabian Groffen [Sat, 3 Mar 2007 11:37:00 +0000 (11:37 -0000)]
Merged from trunk -r614{7,8}
Make sure that excess "nomerge" nodes are pruned correctly.
svn path=/main/branches/prefix/; revision=6151
Fabian Groffen [Sat, 3 Mar 2007 11:33:22 +0000 (11:33 -0000)]
Merged from trunk 6132:6146
When emerge automatically resumes, add --ignore-default-opts to the
command line in order to prevent things like --ask from leaking in via
EMERGE_DEFAULT_OPTS. Thanks to Peter Weller <welp@gentoo.org> for
reporting.
For bug #169046, fill in the --tree display with "nomerge" nodes so that
the user can always see at lease 1 parent on any non-root node.
Packages may appear in the display list multiple times, and will be
marked "nomerge" when their position in the list does not correspond to
actual merge order.
Fix types.InstanceType test which is failing now for some reason.
remove category regex, dumb idea, sorry I did it (WarnerBro)
s/node/selected_parent/ for clarity
For bug #138840, show a more informative message when waiting for a
distfiles lock due to parallel-fetch. Thanks to David Watzke
<david@watzke.cz> for the initial patch.
Add missing sys import.
svn path=/main/branches/prefix/; revision=6150
Fabian Groffen [Sat, 3 Mar 2007 10:35:08 +0000 (10:35 -0000)]
Remove "BeOS","Haiku","HP-UX", add "AIX"
svn path=/main/branches/prefix/; revision=6145
Fabian Groffen [Fri, 2 Mar 2007 14:18:50 +0000 (14:18 -0000)]
don't do the BSD thing in prefix
svn path=/main/branches/prefix/; revision=6132
Fabian Groffen [Fri, 2 Mar 2007 14:17:18 +0000 (14:17 -0000)]
Merged from trunk 6108:6129
Use an alarm signal to implement a timeout when rsync is fetching the
server timestamp file, since rsync's --timeout option doesn't apply to
the initial connection attempt.
Make sure pids are appropriately removed from
portage.process.spawned_pids.
please be --quiet emerge. still need to hunt down one more newline
(Solar)
Add compatibility code to avoid the GNU specific --reference option of
chmod. Thanks to Timothy Redaelli <drizzt@gentoo.org>.
For consistency, remove exit code 2 (protocol incompatibility) from the
other list of rsync exit codes.
Fix broken except statement syntax.
Fix the rest of the broken except statement syntax.
Fix broken rsync exitcode shift.
Remove unnecessary print statement reported by solar.
Even if there's no timestamp available locally, fetch the timestamp
anyway as an initial probe to verify that the server is responsive.
This protects us from hanging indefinitely on a connection attempt to an
unresponsive server which rsync's --timeout option does not prevent.
For bug #168646, remove --prune-empty-dirs from PORTAGE_RSYNC_OPTS since
it's only a small optimization and it's inconvenient to force
>=rsync-2.6.4 on server admins at this time. If users desire, they can
still add it to PORTAGE_RSYNC_EXTRA_OPTS.
svn path=/main/branches/prefix/; revision=6131
Fabian Groffen [Thu, 1 Mar 2007 19:07:23 +0000 (19:07 -0000)]
Merged hotfix from trunk 6106:6107
Fix misplaced [1]
svn path=/main/branches/prefix/; revision=6108
Fabian Groffen [Thu, 1 Mar 2007 16:42:13 +0000 (16:42 -0000)]
Merged from trunk 6101:6104
For bug #168823, fix broken except statement syntax that prevents the
ValueError from being caught as intended.
For bug #168646, don't bail out immediately when rsync detects protocol
incompatibility (code 2) during fetching of the timestamp file. Retry
for a better server (up to PORTAGE_RSYNC_RETRIES).
svn path=/main/branches/prefix/; revision=6106
Fabian Groffen [Wed, 28 Feb 2007 17:08:39 +0000 (17:08 -0000)]
Merged from trunk 6099:6100
update --help example to match current behavior #168678 by Arthur Hagen
(SpankMan)
svn path=/main/branches/prefix/; revision=6101
Fabian Groffen [Tue, 27 Feb 2007 20:53:22 +0000 (20:53 -0000)]
Suggestion from zmedico: use hasq to avoid QA errors about kernel_Darwin
not in IUSE.
svn path=/main/branches/prefix/; revision=6097
Fabian Groffen [Tue, 27 Feb 2007 20:17:14 +0000 (20:17 -0000)]
Duh... use use
svn path=/main/branches/prefix/; revision=6096
Fabian Groffen [Tue, 27 Feb 2007 20:05:07 +0000 (20:05 -0000)]
First shot at getting some checks for potentially wrong dynamic
libraries on Darwin.
svn path=/main/branches/prefix/; revision=6095
Fabian Groffen [Tue, 27 Feb 2007 19:50:25 +0000 (19:50 -0000)]
Also look for .dylibs, as we can use the QA on Darwin too
svn path=/main/branches/prefix/; revision=6094
Fabian Groffen [Tue, 27 Feb 2007 19:35:27 +0000 (19:35 -0000)]
Avoid "TypeError: unpack non-sequence" backtraces, and return a set of
None, None when was asked for the location.
svn path=/main/branches/prefix/; revision=6093
Fabian Groffen [Tue, 27 Feb 2007 19:10:28 +0000 (19:10 -0000)]
Fix undefined whatever 'best' error by importing it from
portage.versions
svn path=/main/branches/prefix/; revision=6092
Fabian Groffen [Tue, 27 Feb 2007 16:55:23 +0000 (16:55 -0000)]
In contrast to CVS, SVN complains when a file is not there when you rm
it. Hence, we don't remove the file before calling svn rm, like we have
to do for cvs.
svn path=/main/branches/prefix/; revision=6091
Fabian Groffen [Tue, 27 Feb 2007 16:52:33 +0000 (16:52 -0000)]
Merged from trunk 6085:6088
For compatibility with older findutils, don't use the -L predicate (bug
#168432).
For bug #168267, use add --force to the default PORTAGE_COMPRESS_FLAGS
so that hardlinks are automatically broken.
svn path=/main/branches/prefix/; revision=6090
Fabian Groffen [Mon, 26 Feb 2007 22:32:13 +0000 (22:32 -0000)]
The new counter_tick_core method code seems to get the prefix
automagically (via VDB_PATH), so no need to add prefix as well. That
actually breaks merging.
svn path=/main/branches/prefix/; revision=6085
Fabian Groffen [Mon, 26 Feb 2007 21:56:01 +0000 (21:56 -0000)]
Merged from trunk 6048:6070
spawn rsync without a shell.
Make verify_all() return an "insufficient data" error if there is not at
least one supported hash type.
Make fetch() bail out when an "Insufficient data for checksum
verification" error occurs.
Do not show the spinner and the "Calculating dependencies" message for
installation actions when the --nodeps option has been specified.
Thanks to David Watzke <david@watzke.cz> for this patch from bug #168169.
Filter paths matching '/<built-in>$' that come from debugedit. Thanks
to Ed Catmur for this patch from bug #165342.
As requested by solar, never show a merge list unless it's explicitly
requested by --ask, --pretend, or --tree.
As requested by solar, never show a merge list unless it's explicitly
requested by --ask, --pretend, or --tree.
Allow --verbose to trigger a merge list even without --pretend, --ask,
or --tree. Thanks to agaffney and zlin for the suggestion.
Clean up os.environ["USERLAND"] pollution from the portage.data module
so that it doesn't interfere with repoman.
For bug #167668, prune empty ${FILESDIR}s by adding --prune-empty-dirs
to PORTAGE_RSYNC_OPTS. Thanks to Ulrich Mueller <ulm@kph.uni-mainz.de>
for the suggestion.
svn path=/main/branches/prefix/; revision=6084
Fabian Groffen [Mon, 26 Feb 2007 21:52:36 +0000 (21:52 -0000)]
Merged from trunk 6039:6048
For bug #167667, use the existence of ${PORTDIR}/manifest1_obsolete to
trigger the disabling of manifest1/digest file generation. This toggle
is repo/overlay specific, allowing a specific overlay to drop manifest1
buy adding the manifest1_obsolete file.
For bug #167667, add support for ${PORTDIR}/manifest1_obsolete and
automatically remove ${FILESDIR}/digest-* from cvs when appropriate.
(prefix: do the same thing for SVN)
Don't bother to parse ${FILESDIR}/digest-* when manifest1_compat is
disabled.
For bug #167668, use an rsync "hide" filter rule to exclude
**/files/digest-* and delete them on the receiver.
Remove quotes since rsync doesn't accept them (and there is no shell to
remove them since we use spawn() for rsync now).
svn path=/main/branches/prefix/; revision=6083
Fabian Groffen [Mon, 26 Feb 2007 21:40:18 +0000 (21:40 -0000)]
Merged from trunk 6036:6039
Fix "NameError: global name 'myfilelist' is not defined" when
collision-protect is enabled.
Make sure that ${A} in initialized in case pkg_nofetch() needs to be
called. Thanks to Peper for reporting.
svn path=/main/branches/prefix/; revision=6082
Fabian Groffen [Mon, 26 Feb 2007 21:38:08 +0000 (21:38 -0000)]
Merged from trunk 6021:6036
s/x/xs/ to fix a typo in a variable name.
For consistency, replace multiple os.getcwd() calls with the "mydir"
variable.
Fix stardir and repodir logic from the previous commit.
Avoid a TypeError when commitmessagefile is None.
Use startdir instead of mydir since mydir has a trailing slash which
triggers normalization issues with the dirname function.
Fix more broken commitmessagefile handling.
Fix broken file list handling for FEATUES=sign when only the Manifest
has changed.
Add some sanity checks for file list handling when repolevel < 3.
svn path=/main/branches/prefix/; revision=6081
Fabian Groffen [Mon, 26 Feb 2007 21:26:27 +0000 (21:26 -0000)]
Merged from trunk 5995:6021
For bug #167450, optimize merge order by delaying the merge of root
nodes.
For bug #166880, always display the merge list (allowing --tree to be
obeyed in any case).
For bug #166880, always display the merge list header.
When calling tar, always exclud . in order to preserver
PORTAGE_WORKDIR_MODE. Thanks to Brian Harring in bug #167544.
Don't exclude . since that excludes the entire contents of some tar
files.
For bug #166564, make a circular dependency panic more user friendly by
displaying the USE flags that are enabled on nodes that are part of
dependency cycles and display a note hinting that circular dependencies
can often be avoided by temporarily disabling USE flags.
Automatically enable --tree mode when displaying nodes with circular
deps.
For bug #167450, optimize leaf node selection by ordering nodes from
highest to lowest overall reference count.
Make digraph._merge_order_bias() operate on a single digraph that's
passed in.
Optimize order for --tree display of circular dependencies.
As requested by vapier, don't show the merge list in --quiet mode unless
it's explicitly requested via --ask or --pretend.
For bug #167795, try avoid the population routine when possible, so that
FEATURES=buildpkg doesn't always force population.
Raise a CommandNotFound exception when necessary, to ease
troubleshooting. Thanks to marienz for reporting.
svn path=/main/branches/prefix/; revision=6080
Fabian Groffen [Mon, 26 Feb 2007 21:22:52 +0000 (21:22 -0000)]
Merged from trunk 5990:5995
Move reverse NEEDED cache into CACHE_PATH and use a more descriptive
name (genone)
extend check for internal references, should remove all libs that are
only used internally now (genone)
Move preserve-libs and collision-protect code from treewalk() into their
own functions (genone)
set.remove() returns None, so can't use it in a function call (genone)
svn path=/main/branches/prefix/; revision=6079
Fabian Groffen [Mon, 26 Feb 2007 21:20:23 +0000 (21:20 -0000)]
Merged from trunk 5981:5990
For bug #166939, make --nodeps work like a normal package for new-style
virtuals.
Remove unnecessary import that triggers DEPRECATION NOTICE.
Fix package.provided breakage from the fix for bug #166939.
For bug #166785, check for invalid categories in the world file.
For bug #163990, warn about ebuilds with invalid categories and do not
allow them to be installed.
For bug #163990, warn about binary packages with invalid categories and
do not allow them to be installed.
svn path=/main/branches/prefix/; revision=6078
Fabian Groffen [Mon, 26 Feb 2007 21:16:35 +0000 (21:16 -0000)]
Merged from trunk 2980:5981
(prefix: now also using the emulation for non-modularised situation)
Replace compat symlinks with a new compat module as the symlink solution
prevents reuse of state information (requested by ferringb)
svn path=/main/branches/prefix/; revision=6077
Fabian Groffen [Mon, 26 Feb 2007 21:04:24 +0000 (21:04 -0000)]
Replay of trunk 5978
Move bin/emerge to pym/emerge/__init__.py to restore old import behavior
as the load_source solution doesn't work properly (genone)
svn path=/main/branches/prefix/; revision=6076
Fabian Groffen [Mon, 26 Feb 2007 20:54:10 +0000 (20:54 -0000)]
Merged from trunk 5976:5977
Make emerge importable again without relying on module search path order
(genone) (prefix: let's take emerge from prefix)
svn path=/main/branches/prefix/; revision=6075
Fabian Groffen [Mon, 26 Feb 2007 20:43:09 +0000 (20:43 -0000)]
Merged from trunk 5964:5976
For bug #158100, use an exact reversal of the actual merge order for
--tree output. It's more efficient than doing 2 order calculations.
Optimize merge order calculation for --tree output when necessary.
Fix CONFIG_PROTECT_MASK support. Thanks to piavlo <piavka@cs.bgu.ac.il>
for this patch from bug #166837.
Add missing quotes.
Add support for RSYNC_EXTRA_OPTS to webrsync (genone)
Print filename when displaying package.mask comments (genone)
[[
Ignore compiled files.
Add new feature 'preserve-libs' that injects files into $D that
- belong to a package instance that is about to be autocleaned
- are not installed by the new package instance
- are listed in at least one NEEDED file in vdb
- are not just used by other files of the package instance
As a side-effect a new file /var/db/pkg/.NEEDED is created that
contains a reversed map of the NEEDED files found in a packages dbdir.
]] (genone)
Print hostname in xterm title if sheridan is available in the
environment (genone)
svn path=/main/branches/prefix/; revision=6074
Fabian Groffen [Mon, 26 Feb 2007 20:33:15 +0000 (20:33 -0000)]
Instead of grepping what should be the last line of SVN's output, simply
cut it off. This is a lazy hack for what already was quite lazy, but to
fix it when the user doesn't use a C locale (the message will be
translated into something else)
svn path=/main/branches/prefix/; revision=6073
Fabian Groffen [Mon, 26 Feb 2007 20:06:38 +0000 (20:06 -0000)]
Typo: we run status, not update
svn path=/main/branches/prefix/; revision=6072
Fabian Groffen [Tue, 13 Feb 2007 20:03:15 +0000 (20:03 -0000)]
Merged from trunk 596{2,3}
Fix broken imports.
svn path=/main/branches/prefix/; revision=5964
Fabian Groffen [Tue, 13 Feb 2007 19:51:52 +0000 (19:51 -0000)]
Merged from trunk 5937:5961 (hi genone!)
add docstrings (WarnerBro)
Move dbapi and related classes out of __init__.py into their own
subpackage. Also perform some minor cleanups. (genone)
fix syntax
Fix imports from the emerge package.
Fix automatic sys.path insertions so that they're relative instead of
absolute hard coded.
remove broken dblink import
fix broken imports
Use os.path.realpath to handle symlinks properly.
Break a recursive loop.
Fix missing stat import.
Fix vardb.cpv_all() breakage.
Add missing VDB_PATH to fix vardbapi.aux_get() breakage.
Make xterm titles work even when color is disabled. Thanks to Joachim
Kaeber <joachim.kaeber@web.de> in bug #166255.
Use the real symbols in import statements, not the references in
__init__.py (genone)
import best() from portage.versions
Make subpackage naming consistent (genone)
In the event of a circular dependency panic, eliminate root nodes in
order to reduce the noise level to a minimum.
tweak PORT_LOGDIR comments so as to not give the wrong impression about
the default value (SpankMan)
Fix missing imports.
Detect potential issues with mtime granlarity in env_update() and sleep
if necessary. Thanks to Brian Harring for reporting.
svn path=/main/branches/prefix/; revision=5962
Fabian Groffen [Sat, 10 Feb 2007 12:50:42 +0000 (12:50 -0000)]
Merged from trunk 5933:5935
update test notes (WarnerBro)
fix a few broken tests (WarnerBro)
svn path=/main/branches/prefix/; revision=5937
Fabian Groffen [Sat, 10 Feb 2007 12:49:22 +0000 (12:49 -0000)]
Make emerge working again (failed with:
% emerge
Traceback (most recent call last):
File "/Library/Gentoo/usr/bin/emerge", line 35, in ?
import emerge.help
ImportError: No module named emerge.help), adding a __init__.py seems to
help.
svn path=/main/branches/prefix/; revision=5936
projects / portage.git / log