portage.git
17 years ago Merged from trunk -r14327:14333
Fabian Groffen [Mon, 21 Sep 2009 18:05:00 +0000 (18:05 -0000)]
   Merged from trunk -r14327:14333

   | 14328    | Fix infinite recursion in items and values methods.         |
   | zmedico  |                                                             |

   | 14329    | Fix infinite recursion in items and values methods.         |
   | zmedico  |                                                             |

   | 14330    | Fix dep_expand so that it doesn't use deprecated            |
   | zmedico  | dep_getcpv() usage (with missing category).                 |

   | 14331    | Fix portage._unicode_func_wrapper.__call__() to properly    |
   | arfrever | handle bytes with Python 3.                                 |

   | 14333    | Support bytes in portage.util.normalize_path() with Python  |
   | arfrever | 3.                                                          |

svn path=/main/branches/prefix/; revision=14353

17 years ago Merged from trunk -r14326:14327
Fabian Groffen [Mon, 21 Sep 2009 17:59:02 +0000 (17:59 -0000)]
   Merged from trunk -r14326:14327

   | 14327    | Use dict.(keys|values|items)() instead of                   |
   | arfrever | dict.(iterkeys|itervalues|iteritems)() for compatibility    |
   |          | with Python 3. (2to3-3.1 -f dict -nw ${FILES})              |

svn path=/main/branches/prefix/; revision=14351

17 years ago Merged from trunk -r14317:14326
Fabian Groffen [Mon, 21 Sep 2009 17:52:39 +0000 (17:52 -0000)]
   Merged from trunk -r14317:14326

   | 14318    | Add deprecation warnings to vartree.exists_specific_cat(),  |
   | zmedico  | getnode(), and hasnode(). Use dbapi methods instead.        |

   | 14319    | Make key_expand() always return Atom type.                  |
   | zmedico  |                                                             |

   | 14320    | Use dep_expand instead of key_expand in the blocker         |
   | zmedico  | display, since it seems like a better fit. Also, use        |
   |          | str(atom) since we don't want to assume that Atoms are      |
   |          | string type (though they happen to be now). This assumption |
   |          | is what caused the traceback in bug 285637, comment #5.     |

   | 14321    | Support both Python 2 and 3 in portage._unicode_encode()    |
   | arfrever | and portage._unicode_decode(). Update decoding in some      |
   |          | files.                                                      |

   | 14322    | Deprecate key_expand and                                    |
   | zmedico  | portage.dbapi.porttree.portagetree.resolve_specific which   |
   |          | calls it.                                                   |

   | 14323    | Fix breakage in _unicode_encode() for non-string types.     |
   | zmedico  |                                                             |

   | 14324    | Show deprecation warnings when dep_* legacy code is         |
   | zmedico  | triggered.                                                  |

   | 14325    | Simplify match_to_list(). Thanks to Marat Radchenko         |
   | zmedico  | <marat@slonopotamus.org> for this patch from bug #276813.   |

   | 14326    | Fix case for 0 args in args unicode conversion.             |
   | zmedico  |                                                             |

svn path=/main/branches/prefix/; revision=14350

17 years ago Merged from trunk -r14316:14317
Fabian Groffen [Mon, 21 Sep 2009 17:51:11 +0000 (17:51 -0000)]
   Merged from trunk -r14316:14317

   | 14317    | Use range() instead of xrange() for compatibility with      |
   | arfrever | Python 3. (2to3-3.1 -f xrange -nw ${FILES})                 |

svn path=/main/branches/prefix/; revision=14349

17 years ago Merged from trunk -r14315:14316
Fabian Groffen [Mon, 21 Sep 2009 17:48:54 +0000 (17:48 -0000)]
   Merged from trunk -r14315:14316

   | 14316    | Define basestring as str when Python 3 is used.             |
   | arfrever |                                                             |

svn path=/main/branches/prefix/; revision=14348

17 years ago Merged from trunk -r14314:14315
Fabian Groffen [Mon, 21 Sep 2009 17:46:12 +0000 (17:46 -0000)]
   Merged from trunk -r14314:14315

   | 14315    | Fix all remaining SyntaxErrors with Python 3.               |
   | arfrever |                                                             |

svn path=/main/branches/prefix/; revision=14346

17 years ago Merged from trunk -r14313:14314
Fabian Groffen [Mon, 21 Sep 2009 17:45:06 +0000 (17:45 -0000)]
   Merged from trunk -r14313:14314

   | 14314    | Use filter() and zip() instead of itertools.ifilter() and   |
   | arfrever | itertools.izip() for compatibility with Python 3. (2to3-3.1 |
   |          | -f itertools -f itertools_imports -nw ${FILES})             |

svn path=/main/branches/prefix/; revision=14345

17 years ago Merged from trunk -r14306:14313
Fabian Groffen [Mon, 21 Sep 2009 17:43:04 +0000 (17:43 -0000)]
   Merged from trunk -r14306:14313

   | 14307   | Fix typos in http.client imports.                            |
   | zmedico |                                                              |

   | 14308   | Remove virtuals from the cache because they're unused since  |
   | zmedico | portage-2.1.6 and it won't hurt older portage.               |

   | 14309   | Fix redundant Atom construtor call in                        |
   | zmedico | _show_unsatisfied_dep().                                     |

   | 14310   | Tread blockers as invalid.                                   |
   | zmedico |                                                              |

   | 14311   | Fix AtomArg constructor calls to pass in Atom instances, so  |
   | zmedico | the constructor never has to construct one.                  |

   | 14312   | When generating config.prevmaskdict, only call the Atom      |
   | zmedico | constructor when necessary.                                  |

   | 14313   | Make Atom.__init__ call the base class constructor, though   |
   | zmedico | it doesn't seem to matter.                                   |

svn path=/main/branches/prefix/; revision=14344

17 years ago Merged from trunk -r14296:14306
Fabian Groffen [Mon, 21 Sep 2009 17:41:37 +0000 (17:41 -0000)]
   Merged from trunk -r14296:14306

   | 14297   | Add back a line which I erroneously removed when committing  |
   | zmedico | the patch for bug 203733. Thanks to Alexis Ballier           |
   |         | <aballier@g.o> for reporting the related KeyError.           |

   | 14298   | In doebuild_environment(), detect if setcpv() hasn't been    |
   | zmedico | called properly, and call it if necessary (mainly for api    |
   |         | consumers).                                                  |

   | 14299   | Make _unicode_module_wrapper cache wrappers and reuse them.  |
   | zmedico | Thanks to Marat Radchenko <marat@slonopotamus.org> for this  |
   |         | patch from bug #276813.                                      |

   | 14300   | Make Atom inherit from str. Thanks to Marat Radchenko        |
   | zmedico | <marat@slonopotamus.org> for this patch from bug #276813.    |

   | 14301   | Use _unicode_encode() to ensure that only unicode strings    |
   | zmedico | are passed into io.StringIO text streams.                    |

   | 14302   | Misc unicode fixes for repoman.                              |
   | zmedico |                                                              |

   | 14303   | Add support in ConsoleStyleFile.write() for unicode encoding |
   | zmedico | when writing to stdout/stderr in python-2.x.                 |

   | 14304   | Add fallback in ImportError for io.StringIO. This is needed  |
   | zmedico | for python-2.6 with USE=build since io imports threading     |
   |         | which imports thread which is unavailable.                   |

   | 14305   | Fix depgraph._validate_blockers() so that it doesn't do      |
   | zmedico | prohibited Atom(Atom) constructor calls.                     |

   | 14306   | Fix typo from previous commit.                               |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=14342

17 years ago Merged from trunk -r14295:14296
Fabian Groffen [Mon, 21 Sep 2009 17:39:25 +0000 (17:39 -0000)]
   Merged from trunk -r14295:14296

   | 14296    | Fix position of imports from __future__.                    |
   | arfrever |                                                             |

svn path=/main/branches/prefix/; revision=14341

17 years ago Merged from trunk -r14294:14295
Fabian Groffen [Mon, 21 Sep 2009 17:35:18 +0000 (17:35 -0000)]
   Merged from trunk -r14294:14295

   | 14295    | Support print() function with Python 2 in more files.       |
   | arfrever |                                                             |

svn path=/main/branches/prefix/; revision=14340

17 years ago Merged from trunk -r14293:14294
Fabian Groffen [Mon, 21 Sep 2009 17:32:15 +0000 (17:32 -0000)]
   Merged from trunk -r14293:14294

   | 14294    | Update system imports for compatibility with Python 3.      |
   | arfrever |                                                             |

svn path=/main/branches/prefix/; revision=14339

17 years ago Merged from trunk -r14291:14293
Fabian Groffen [Mon, 21 Sep 2009 17:25:19 +0000 (17:25 -0000)]
   Merged from trunk -r14291:14293

   | 14292    | Update syntax of numbers for compatibility with Python 3.   |
   | arfrever | (2to3-3.1 -f numliterals -nw ${FILES})                      |

   | 14293    | Update syntax of numbers in some files which were missing   |
   | arfrever | in previous commit.                                         |

svn path=/main/branches/prefix/; revision=14338

17 years ago Merged from trunk -r14290:14291
Fabian Groffen [Mon, 21 Sep 2009 17:22:22 +0000 (17:22 -0000)]
   Merged from trunk -r14290:14291

   | 14291    | Support print() function with Python 2 in some files.       |
   | arfrever |                                                             |

svn path=/main/branches/prefix/; revision=14337

17 years ago Merged from trunk -r14289:14290
Fabian Groffen [Mon, 21 Sep 2009 17:19:05 +0000 (17:19 -0000)]
   Merged from trunk -r14289:14290

   | 14290    | Update syntax of calls to print() for compatibility with    |
   | arfrever | Python 3. (2to3-3.1 -f print -nw ${FILES})                  |

svn path=/main/branches/prefix/; revision=14336

17 years ago Merged from trunk -r14288:14289
Fabian Groffen [Mon, 21 Sep 2009 17:10:32 +0000 (17:10 -0000)]
   Merged from trunk -r14288:14289

   | 14289    | Update syntax of 'except' statements for compatibility with |
   | arfrever | Python 3. (2to3-3.1 -f except -nw ${FILES})                 |

svn path=/main/branches/prefix/; revision=14335

17 years ago Merged from trunk -r14284:14288
Fabian Groffen [Mon, 21 Sep 2009 17:07:18 +0000 (17:07 -0000)]
   Merged from trunk -r14284:14288

   | 14285   | Fix config.setinst() to add Atom instances to the provider   |
   | zmedico | lists instead of plain str.                                  |

   | 14286   | Add isinstance(mydep, Atom) checks to the dep_* functions    |
   | zmedico | since we don't use a metaclass to do that anymore (due to    |
   |         | performance).                                                |

   | 14288   | Bug #285637 - Fix NameError exception triggered by           |
   | zmedico | InvalidAtom in grabfile_package().                           |

svn path=/main/branches/prefix/; revision=14334

17 years ago Merged from trunk -r14274:14284
Fabian Groffen [Mon, 21 Sep 2009 17:02:37 +0000 (17:02 -0000)]
   Merged from trunk -r14274:14284

   | 14279   | Atom optimizations. Remove the metaclass and cache since it  |
   | zmedico | just slows it down. Thanks to Marat Radchenko                |
   |         | <marat@slonopotamus.org> for this patch.                     |

   | 14280   | Use a dict for Package.metadata, because it's faster. Thanks |
   | zmedico | to Marat Radchenko <marat@slonopotamus.org> for this patch   |
   |         | from bug #276813.                                            |

   | 14281   | Fix _expand_new_virtuals() to preserve USE deps in atoms for |
   | zmedico | new-style virtuals, and update the corresponding depgraph    |
   |         | code.                                                        |

   | 14282   | Avoid lots of redundant Atom constructor calls. Thanks to    |
   | zmedico | Marat Radchenko <marat@slonopotamus.org> for the initial     |
   |         | patch from bug #276813.                                      |

   | 14283   | Remove obsolete InvalidAtom handler in                       |
   | zmedico | _add_pkg_dep_string().                                       |

   | 14284   | Revert accidental changes                                    |
   | zmedico | _unicode_module_wrapper.__getattribute__ from previous       |
   |         | commit.                                                      |

svn path=/main/branches/prefix/; revision=14332

17 years agoDeal with spaces, especially OSX loves them
Fabian Groffen [Wed, 16 Sep 2009 19:04:34 +0000 (19:04 -0000)]
Deal with spaces, especially OSX loves them

svn path=/main/branches/prefix/; revision=14278

17 years ago Merged from trunk -r14270:14274
Fabian Groffen [Wed, 16 Sep 2009 18:13:39 +0000 (18:13 -0000)]
   Merged from trunk -r14270:14274

   | 14271    | Make depgraph._select_atoms() return a dict, in order to    |
   | zmedico  | separate selected direct deps from indirect virtual deps.   |

   | 14272    | Add support in depgraph._add_pkg_dep_string() for adding    |
   | zmedico  | indirect virtual deps to the graph. This takes advantage of |
   |          | circular dependency avoidance that's done by dep_zapdeps,   |
   |          | while avoiding the dependency graph distortion reported in  |
   |          | bug #283795.                                                |

   | 14273    | Fix broken virtual depth code from previous commit.         |
   | zmedico  |                                                             |

   | 14274    | Update documentation of inherit. Reported by Jeremy Olexa.  |
   | arfrever |                                                             |

svn path=/main/branches/prefix/; revision=14277

17 years ago Merged from trunk -r14256:14270
Fabian Groffen [Wed, 16 Sep 2009 18:12:43 +0000 (18:12 -0000)]
   Merged from trunk -r14256:14270

   | 14259   | Use a regular expression for cpv_getkey(), and fall back to  |
   | zmedico | legacy code if no match is found.                            |

   | 14261   | Insice match_from_list(), use remove_slot() instead of       |
   | zmedico | dep_getcpv() where appropriate.                              |

   | 14262   | Make dep_getcpv() use Atom, and fall back to legacy code for |
   | zmedico | backward compat.                                             |

   | 14264   | Simplify cpv_getkey() by just calling dep_getkey('=' +       |
   | zmedico | mycpv).                                                      |

   | 14269   | Reimplement the code from bug #283795 so that indirect deps  |
   | zmedico | are preserved for later use. TODO: Write code to add         |
   |         | selected indirect virtual deps to the graph. This will take  |
   |         | advantage of circular dependency avoidance that's done by    |
   |         | dep_zapdeps.                                                 |

   | 14270   | When _expand_new_virtuals() is called by repoman, skip       |
   | zmedico | expansion of new-style virtuals.                             |

svn path=/main/branches/prefix/; revision=14276

17 years agoonly look for executables, that makes more sense and removes a lot of matches, with...
Fabian Groffen [Wed, 16 Sep 2009 18:11:06 +0000 (18:11 -0000)]
only look for executables, that makes more sense and removes a lot of matches, with this reduction we no longer need to ignore usr/share/doc (in theory)

svn path=/main/branches/prefix/; revision=14275

17 years agoRemove now stray comment
Fabian Groffen [Mon, 14 Sep 2009 11:01:20 +0000 (11:01 -0000)]
Remove now stray comment

svn path=/main/branches/prefix/; revision=14268

17 years agoautomatically fix shebangs where possible as the number of problems is too big to...
Fabian Groffen [Mon, 14 Sep 2009 10:59:46 +0000 (10:59 -0000)]
automatically fix shebangs where possible as the number of problems is too big to fix them all in the ebuilds

svn path=/main/branches/prefix/; revision=14267

17 years agoavoid many false positives
Fabian Groffen [Mon, 14 Sep 2009 09:50:41 +0000 (09:50 -0000)]
avoid many false positives

svn path=/main/branches/prefix/; revision=14266

17 years agoremove /etc/{init,conf}.d stuff until we fix bug #196294
Fabian Groffen [Mon, 14 Sep 2009 09:39:25 +0000 (09:39 -0000)]
remove /etc/{init,conf}.d stuff until we fix bug #196294

svn path=/main/branches/prefix/; revision=14265

17 years agokill some false positives in documentation
Fabian Groffen [Mon, 14 Sep 2009 08:22:09 +0000 (08:22 -0000)]
kill some false positives in documentation

svn path=/main/branches/prefix/; revision=14263

17 years ago Merged from trunk -r14250:14256
Fabian Groffen [Mon, 14 Sep 2009 07:53:17 +0000 (07:53 -0000)]
   Merged from trunk -r14250:14256

   | 14251   | Simplify the _pkg regex and fix validation for some cases by |
   | zmedico | using the _version regex to match unwanted version-like      |
   |         | components which can not be at the end of a _pkg match. For  |
   |         | example isvalidatom('app-doc/php-docs-20071125-r2') now      |
   |         | correctly returns False.                                     |

   | 14252   | Simplify isvalidatom() to simply use the Atom class. Thanks  |
   | zmedico | to Marat Radchenko <marat@slonopotamus.org> for the          |
   |         | suggestion.                                                  |

   | 14253   | Add more test cases.                                         |
   | zmedico |                                                              |

   | 14254   | Use the Atom class to implement dep_getkey(), and fall back  |
   | zmedico | to legacy code when necessary for backward compatibility.    |

   | 14255   | Make isspecific() use the Atom class and fall back to legacy |
   | zmedico | code if the atom is invalid. Also, optimize called           |
   |         | isjustname() legacy code to only check the last 2            |
   |         | components.                                                  |

   | 14256   | Make get_operator() use Atom, and remove unnecessary         |
   | zmedico | reflection code from dep_getkey(). Thanks to Marat Radchenko |
   |         | <marat@slonopotamus.org> for suggestions.                    |

svn path=/main/branches/prefix/; revision=14260

17 years ago Merged from trunk -r14242:14249
Fabian Groffen [Mon, 14 Sep 2009 07:52:07 +0000 (07:52 -0000)]
   Merged from trunk -r14242:14249

   | 14249   | Simlify the Atom regex. Thanks to Marat Radchenko            |
   | zmedico | <marat@slonopotamus.org> for this patch.                     |

svn path=/main/branches/prefix/; revision=14258

17 years agoadd shebang check, bug #282539
Fabian Groffen [Mon, 14 Sep 2009 07:46:54 +0000 (07:46 -0000)]
add shebang check, bug #282539

svn path=/main/branches/prefix/; revision=14257

17 years agoContext:
Fabian Groffen [Sun, 13 Sep 2009 19:14:16 +0000 (19:14 -0000)]
Context:
http://archives.gentoo.org/gentoo-alt/msg_2d3dfb3888ac4dcd4e64e1539ef039ff.xml

Let Portage not be tricked by symlinks when determining whether to
remove a directory.  This solves the case where the user added symlink
in place of the original directory and Portage would unmerge the
symlink.  With this patch Portage detects it is not dealing with a
directory but a symlink.  I think this is what was originally intended
in this code.  zmedico should give it a thorough look before merging
back to trunk.

svn path=/main/branches/prefix/; revision=14248

17 years ago Merged from trunk -r14239:14242
Fabian Groffen [Sun, 13 Sep 2009 19:05:11 +0000 (19:05 -0000)]
   Merged from trunk -r14239:14242

   | 14240   | Fix docs for isjustname() since it doesn't raise InvalidAtom |
   | zmedico | now.                                                         |

   | 14241   | Make the Atom constructor use regular expression match       |
   | zmedico | groups for initialization. Thanks to Marat Radchenko         |
   |         | <marat@slonopotamus.org> for this patch.                     |

   | 14242   | Use cpv_getkey() instead of dep_getkey() where appropriate.  |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=14247

17 years ago Merged from trunk -r14229:14239
Fabian Groffen [Sun, 13 Sep 2009 19:03:52 +0000 (19:03 -0000)]
   Merged from trunk -r14229:14239

   | 14230   | Make parse_updates() and update_dbentry() use Atom           |
   | zmedico | instances.                                                   |

   | 14231   | Add missing InvalidAtom import.                              |
   | zmedico |                                                              |

   | 14232   | Make dbapi.move_ent() take advantage of Atom instances when  |
   | zmedico | validating arguments.                                        |

   | 14233   | In config.getvirtuals(), save Atom instances in order to     |
   | zmedico | avoid revalidation. Also, fix cpv_expand() to handle Atom    |
   |         | instances from config.getvirtuals().                         |

   | 14234   | Reimplement isjustname() using the Atom class. Thanks to     |
   | zmedico | Marat Radchenko <marat@slonopotamus.org> for the suggestion. |

   | 14235   | Fix isjustname docstring to have a valid atom in the         |
   | zmedico | example.                                                     |

   | 14236   | Use isjustname() where appropriate.                          |
   | zmedico |                                                              |

   | 14237   | Fix bug in _expand_new_virtuals() reported by Arfrever:      |
   | zmedico | TypeError: coercing to Unicode: need string or buffer, Atom  |
   |         | found                                                        |

   | 14238   | Add tests for the Atom class.                                |
   | zmedico |                                                              |

   | 14239   | Add backward compatibility to isjustname(), so the tests     |
   | zmedico | don't fail.                                                  |

svn path=/main/branches/prefix/; revision=14246

17 years ago Merged from trunk -r14219:14229
Fabian Groffen [Sun, 13 Sep 2009 19:02:13 +0000 (19:02 -0000)]
   Merged from trunk -r14219:14229

   | 14220   | Add test case for * operator with missing =.                 |
   | zmedico |                                                              |

   | 14221   | Add test cases for operators with missing version component. |
   | zmedico |                                                              |

   | 14222   | Bug #257660 - Handle directories that are unlisted in        |
   | zmedico | Entries, which is normal when checked out without -P. Thanks |
   |         | to Christian Ruppert <idl0r@gentoo.org> for this patch.      |

   | 14223   | Implement Atom.__copy__ and __deepcopy__ to return self,     |
   | zmedico | since instances are immutable.                               |

   | 14224   | Make grabdict_package() and grabfile_package() return Atom   |
   | zmedico | instances when possible, in order to avoid revalidation.     |

   | 14225   | Make grabfile_package() accept *atom only for files named    |
   | zmedico | 'packages' since they are not valid in any other files.      |

   | 14226   | Update grabdict_package and grabfile_package calling code to |
   | zmedico | take advantage of Atom instances, and convert *atom from     |
   |         | 'packages' to a normal Atom instance when it's stored in     |
   |         | prevmaskdict.                                                |

   | 14227   | Fix bugs and poor assumptions.                               |
   | zmedico |                                                              |

   | 14228   | Fix poor assumptions.                                        |
   | zmedico |                                                              |

   | 14229   | Fix bad assumptions.                                         |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=14245

17 years ago Merged from trunk -r14209:14219
Fabian Groffen [Sun, 13 Sep 2009 19:01:10 +0000 (19:01 -0000)]
   Merged from trunk -r14209:14219

   | 14210   | In catpkgsplit(), use split('/', 1) since there should never |
   | zmedico | be more than on slash to split.                              |

   | 14211   | Optimize catpkgsplit() by creating a tuple directly instead  |
   | zmedico | of generating it from a list. Thanks to Marat Radchenko      |
   |         | <slonopotamusorama@gmail.com> for this patch.                |

   | 14212   | Bug #283795 - Make dep_check() filter out expanded indirect  |
   | zmedico | virual deps after they are no longer needed, in order to     |
   |         | avoid distortion of the depgraph.                            |

   | 14213   | Reimplement isvalidatom() to use a single regular expression |
   | zmedico | match. Thanks to Marat Radchenko <marat@slonopotamus.org>    |
   |         | for this patch from bug #276813.                             |

   | 14214   | In debug mode, avoid showing gcc QA search strings in the    |
   | zmedico | trace, so they won't trigger false positives. Thanks to Amit |
   |         | Dor-Shifer <amitds@oversi.com> for reporting.                |

   | 14215   | Fix code from previous commit so it's guaranteed to always   |
   | zmedico | properly reset debug state.                                  |

   | 14216   | Fix isvalidatom() to check the 'must not end in' clause from |
   | zmedico | PMS 2.1.2. Thanks to Marat Radchenko                         |
   |         | <marat@slonopotamus.org> for this patch.                     |

   | 14217   | Reimplement isspecific() using a single regular expression   |
   | zmedico | match. Thanks to Marat Radchenko <marat@slonopotamus.org>    |
   |         | for this patch.                                              |

   | 14218   | Fix false positives in gcc QA with debug mode some more.     |
   | zmedico | Thanks again to Amit Dor-Shifer <amitds@oversi.com> for      |
   |         | reporting.                                                   |

   | 14219   | simplify atom regex (winning even more performance) and      |
   | zmedico | turns it in verbose mode with comments. Added more corner    |
   |         | case tests. Thanks to Marat Radchenko                        |
   |         | <marat@slonopotamus.org> for this patch from bug #276813.    |

svn path=/main/branches/prefix/; revision=14244

17 years ago Merged from trunk -r14200:14209
Fabian Groffen [Sun, 13 Sep 2009 18:56:52 +0000 (18:56 -0000)]
   Merged from trunk -r14200:14209

   | 14201   | Use _unicode_decode() on the string returned from            |
   | zmedico | time.strftime(), in order to avoid a potential               |
   |         | UnicodeDecodeError later. Thanks to Markus Duft              |
   |         | <mduft@gentoo.org> for reporting.                            |

   | 14202   | Inside Scheduler._check_manifests(), display all broken      |
   | zmedico | manifests instead of returning after the first one. Thanks   |
   |         | to Vlastimil Babka <caster@g.o> for the suggestion.          |

   | 14203   | Add a vardbapi._pkgs_changed attribute to use instead of     |
   | zmedico | PORTAGE_COUNTER_HASH for emerge to check whether any         |
   |         | packages have been added/removed. This is an optimization,   |
   |         | since vardbapi._counter_hash() can be somewhat slow on       |
   |         | embedded systems. Thanks to Marat Radchenko                  |
   |         | <slonopotamusorama@gmail.com> for reporting.                 |

   | 14204   | Add ACCEPT_LICENSE and ACCEPT_PROPERTIES to the Packages     |
   | zmedico | file header.                                                 |

   | 14205   | Document ACCEPT_LICENSE and package.license.                 |
   | zmedico |                                                              |

   | 14206   | Document ACCEPT_PROPERTIES and package.properties.           |
   | zmedico |                                                              |

   | 14207   | Remove unused vardbapi._counter_hash() method.               |
   | zmedico |                                                              |

   | 14208   | In display_news_notification(), use the exising vartree      |
   | zmedico | instance to populate settings.treeVirtuals, to avoid having  |
   |         | a temporary one instantiated. Thanks to Marat Radchenko      |
   |         | <slonopotamusorama@gmail.com> for reporting.                 |

   | 14209   | Handle AttributeError instead of using getattr. Thanks to    |
   | zmedico | Marat Radchenko <slonopotamusorama@gmail.com> for reporting. |

svn path=/main/branches/prefix/; revision=14243

17 years ago Merged from trunk -r14198:14199
Fabian Groffen [Sat, 5 Sep 2009 13:36:07 +0000 (13:36 -0000)]
   Merged from trunk -r14198:14199

   | 14199   | DEPCACHE_PATH is not used with ROOT at all, so move it out   |
   | grobian | of the target_root variable group                            |

svn path=/main/branches/prefix/; revision=14200

17 years ago Merged from trunk -r14196:14197
Fabian Groffen [Sat, 5 Sep 2009 11:15:48 +0000 (11:15 -0000)]
   Merged from trunk -r14196:14197

   | 14197   | pym/portage/sets/files.py: use WORLD_FILE instead of manual  |
   | grobian | reconstruction pym/portage/const.py: introduce               |
   |         | WORLD_SETS_FILE variable pym/portage/sets/files.py: use new  |
   |         | WORLD_SETS_FILE var pym/_emerge/unmerge.py: likewise         |

svn path=/main/branches/prefix/; revision=14198

17 years agoPRIVATE_PATH is used with ROOT, so it should include EPREFIX
Fabian Groffen [Sat, 5 Sep 2009 11:06:05 +0000 (11:06 -0000)]
PRIVATE_PATH is used with ROOT, so it should include EPREFIX

svn path=/main/branches/prefix/; revision=14196

17 years ago Merged from trunk -r14186:14191
Fabian Groffen [Sat, 5 Sep 2009 11:00:20 +0000 (11:00 -0000)]
   Merged from trunk -r14186:14191

   | 14187   | Fix usage of VDB_PATH                                        |
   | grobian |                                                              |

   | 14188   | consistently use CACHE_PATH with target_root, this commit    |
   | grobian | needs a separate soon to be done commit of                   |
   |         | pym/portage/const.py to work correctly                       |

   | 14189   | PRIVATE_PATH has no leading slash (like all other uses of    |
   | grobian | this var assume)                                             |

   | 14190   | add note that this file does not seem to deal with ROOT at   |
   | grobian | all                                                          |

   | 14191   | DEPRECATED_PROFILE_FILE is derived from PROFILE_PATH which   |
   | grobian | has no leading slash                                         |

svn path=/main/branches/prefix/; revision=14195

17 years ago Merged from trunk -r14182:14186
Fabian Groffen [Sat, 5 Sep 2009 10:55:47 +0000 (10:55 -0000)]
   Merged from trunk -r14182:14186

   | 14184    | Fix documentation of some QA_* variables.                   |
   | arfrever |                                                             |

   | 14185    | Bug #282808 - Handle a potential KeyError inside            |
   | zmedico  | PollScheduler._poll_loop() when _poll_event_queue contains  |
   |          | an event for a file descriptor that has already been        |
   |          | unregistered.                                               |

   | 14186    | Remove unnecessary redundant dict lookup at the beginning   |
   | zmedico  | of catpkgsplit(). Thanks to Marat Radchenko                 |
   |          | <slonopotamusorama@gmail.com> for this patch.               |

svn path=/main/branches/prefix/; revision=14194

17 years ago(reproduced commit r14192 from trunk)
Fabian Groffen [Sat, 5 Sep 2009 10:54:56 +0000 (10:54 -0000)]
(reproduced commit r14192 from trunk)

reorganise const.py to have logical grouping based on usage

grouped into use with config_root, target_root or nothing, made all
variables that are used with config_root or target_root not start with a
leading slash, such that they can be directly used with os.path.join
(which they should because of xxxx_root).

svn path=/main/branches/prefix/; revision=14193

17 years ago Merged from trunk -r14176:14182
Fabian Groffen [Fri, 4 Sep 2009 19:20:24 +0000 (19:20 -0000)]
   Merged from trunk -r14176:14182

   | 14180   | Use _unicode_decode() on the string retunred from            |
   | zmedico | time.strftime(), in order to avoid a potential               |
   |         | UnicodeDecodeError later. Thanks to Markus Duft              |
   |         | <mduft@gentoo.org> for reporting.                            |

   | 14181   | Bug #283513 - Do not allow --noreplace together with         |
   | zmedico | --emptytree since it results in bogus masking messages.      |

   | 14182   | Fix typo from previous commit.                               |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=14183

17 years agodispatch-conf.conf isn't really parsed by bash, but by python code, which doesn't...
Fabian Groffen [Wed, 2 Sep 2009 18:36:46 +0000 (18:36 -0000)]
dispatch-conf.conf isn't really parsed by bash, but by python code, which doesn't get only sub-parts being quoted, so to fix bug #283541, quote the entire string

svn path=/main/branches/prefix/; revision=14179

17 years ago Merged from trunk -r14170:14176
Fabian Groffen [Tue, 1 Sep 2009 17:23:10 +0000 (17:23 -0000)]
   Merged from trunk -r14170:14176

   | 14171    | Bug #283223 - Don't call str() inside _db_escape_string(),  |
   | zmedico  | since it's redundant and it can trigger a                   |
   |          | UnicodeEncodeError in python-2.x.                           |

   | 14172    | Bug #283223 - Don't call str() on unicode strings inside    |
   | zmedico  | _db_escape_string(), since it can trigger a                 |
   |          | UnicodeEncodeError in python-2.x.                           |

   | 14173    | Fix broken indentation from previous commits.               |
   | zmedico  |                                                             |

   | 14174    | Bug #283292 - Fix FindPortdir() to prevent OSError: [Errno  |
   | zmedico  | 2] from stat when $PWD is unset. Thanks to Jonathan Callen  |
   |          | <en.ABCD@gmail.com> for this patch.                         |

   | 14175    | Add dev-util/gperf to list of suspected run-time            |
   | arfrever | dependencies (bug #283357).                                 |

   | 14176    | Remove reference to GRP_STAGE23_USE (bug #283358).          |
   | arfrever |                                                             |

svn path=/main/branches/prefix/; revision=14178

17 years ago Merged from trunk -r14160:14170
Fabian Groffen [Tue, 1 Sep 2009 17:20:21 +0000 (17:20 -0000)]
   Merged from trunk -r14160:14170

   | 14161    | Fix mkdir() to call the local setfscreate() with strict     |
   | zmedico  | returncode checking. Thanks to Chris PeBenito               |
   |          | <pebenito@gentoo.org> for this patch.                       |

   | 14162    | Use plain ascii encoding for this file, in order to avoid   |
   | zmedico  | error messages like this which building stages (happens     |
   |          | when python is built with USE=build): * Byte compiling      |
   |          | python modules for python-2.6 .. ... Compiling              |
   |          | //usr/lib64/portage/pym/portage/cache/ebuild_xattr.py ...   |
   |          | SyntaxError: ('unknown encoding: UTF8',                     |
   |          | ('//usr/lib64/portage/pym/portage/cache/ ebuild_xattr.py',  |
   |          | 0, 0, None))                                                |

   | 14163    | Fix tar_contents() to handle UnicodeEncodeError by falling  |
   | zmedico  | back to utf_8 if appropriate.                               |

   | 14164    | Fix the code from bug #275796 to ensure that choices always |
   | zmedico  | go into the preferred_in_graph slot when appropriate.       |

   | 14165    | Bug #278729 - Inside dep_zapdeps(), account for USE         |
   | zmedico  | dependencies in some cases where USE settings can adversely |
   |          | affect || preference evaluation. This requires invalid      |
   |          | atoms to be dropped inside _expand_new_virtuals() since we  |
   |          | only want real Atom instances inside dep_zapdeps(). Unlike  |
   |          | previous attempts to solve this bug, cases such as || (     |
   |          | foo[a] foo[b] ) should now be correctly handled.            |

   | 14166    | Improve logic for bug #278729.                              |
   | zmedico  |                                                             |

   | 14167    | Bug #281834 - In getconfig(), do not allow definition of    |
   | zmedico  | variables that have invalid names according to shell        |
   |          | standards (such as names containing hyphens).               |

   | 14168    | Use KeyValuePairFileLoader instead of getconfig() for       |
   | zmedico  | /etc/portage/modules, since getconfig() is too strict about |
   |          | variable names now. Thanks to Arfrever for reporting.       |

   | 14169    | Use KeyValuePairFileLoader intead on getconfig(), since     |
   | zmedico  | getconfig() is too strict about variable names now.         |

   | 14170    | Many packages use setuptools at run-time, so remove it from |
   | arfrever | list of suspected run-time dependencies.                    |

svn path=/main/branches/prefix/; revision=14177

17 years agoimport portage, like trunk does
Fabian Groffen [Wed, 26 Aug 2009 10:10:57 +0000 (10:10 -0000)]
import portage, like trunk does

svn path=/main/branches/prefix/; revision=14160

17 years agobump python requirement to 2.5, patch by Jeremy Olexa, bug #282618
Fabian Groffen [Wed, 26 Aug 2009 09:56:14 +0000 (09:56 -0000)]
bump python requirement to 2.5, patch by Jeremy Olexa, bug #282618

svn path=/main/branches/prefix/; revision=14159

17 years ago Merged from trunk -r14151:14155
Fabian Groffen [Wed, 26 Aug 2009 09:52:04 +0000 (09:52 -0000)]
   Merged from trunk -r14151:14155

   | 14154   | Show log paths when displaying the list of failed packages   |
   | zmedico | for --keep-going.                                            |

   | 14155   | Inside depgraph._show_unsatisfied_dep(), show reasons for    |
   | zmedico | packages masked due to backtracking.                         |

svn path=/main/branches/prefix/; revision=14158

17 years agoimport EPREFIX from portage.const, bug #282581
Fabian Groffen [Wed, 26 Aug 2009 09:50:07 +0000 (09:50 -0000)]
import EPREFIX from portage.const, bug #282581

svn path=/main/branches/prefix/; revision=14157

17 years agofix quickpkg now os is no longer imported
Fabian Groffen [Wed, 26 Aug 2009 09:46:57 +0000 (09:46 -0000)]
fix quickpkg now os is no longer imported

svn path=/main/branches/prefix/; revision=14156

17 years agoEROOT is readonly, so cannot unset it
Fabian Groffen [Mon, 24 Aug 2009 10:18:57 +0000 (10:18 -0000)]
EROOT is readonly, so cannot unset it

svn path=/main/branches/prefix/; revision=14153

17 years ago Merged from trunk -r14140:14151
Fabian Groffen [Mon, 24 Aug 2009 10:16:48 +0000 (10:16 -0000)]
   Merged from trunk -r14140:14151

   | 14151   | make sure we can deal with arches like x86-fbsd, like is     |
   | grobian | done in bin/ebuild-helpers/prepstrip                         |

svn path=/main/branches/prefix/; revision=14152

17 years agofix portage meltdown due to wrong order of imports
Fabian Groffen [Mon, 24 Aug 2009 10:12:18 +0000 (10:12 -0000)]
fix portage meltdown due to wrong order of imports

svn path=/main/branches/prefix/; revision=14150

17 years agoconflicts are bad, and not valid python syntax
Fabian Groffen [Mon, 24 Aug 2009 10:05:03 +0000 (10:05 -0000)]
conflicts are bad, and not valid python syntax

svn path=/main/branches/prefix/; revision=14149

17 years ago Merged from trunk -r14131:14140
Fabian Groffen [Mon, 24 Aug 2009 09:50:34 +0000 (09:50 -0000)]
   Merged from trunk -r14131:14140

   | 14132   | Add a LIVEVCS.unmasked category for ebuilds that have        |
   | zmedico | non-empty KEYWORDS and are not masked in the global          |
   |         | package.mask. Thanks to Diego E. Pettenò for the            |
   |         | suggestion.                                                  |

   | 14133   | Bug #282306 - Inside dblink._match_contents(), fall back to  |
   | zmedico | utf_8 encoding if a path cannot be encoded under the user's  |
   |         | chosen encoding. This should fix the traceback shown in bug  |
   |         | #281199, comment #26.                                        |

   | 14134   | Bug #282505 - Fix unicode handling for package moves in      |
   | zmedico | binary packages.                                             |

   | 14140   | remove FIXME, since zmedico fixed it                         |
   | grobian |                                                              |

svn path=/main/branches/prefix/; revision=14148

17 years agoport LinkageMap encoding fix to LinkageMapMachO
Fabian Groffen [Mon, 24 Aug 2009 09:49:02 +0000 (09:49 -0000)]
port LinkageMap encoding fix to LinkageMapMachO

svn path=/main/branches/prefix/; revision=14147

17 years ago Merged from trunk -r14130:14131
Fabian Groffen [Mon, 24 Aug 2009 09:44:30 +0000 (09:44 -0000)]
   Merged from trunk -r14130:14131

   | 14131   | Bug #282306 - Inside                                         |
   | zmedico | LinkageMap._ObjectKey._generate_object_key(), fall back to   |
   |         | utf_8 encoding if a path cannot be encoded under the user's  |
   |         | chosen encoding. This should complete the fix for the        |
   |         | traceback shown in bug #282115, comment #6.                  |

svn path=/main/branches/prefix/; revision=14146

17 years ago Merged from trunk -r14127:14130
Fabian Groffen [Mon, 24 Aug 2009 09:42:25 +0000 (09:42 -0000)]
   Merged from trunk -r14127:14130

   | 14128   | Make Scheduler._choose_pkg() prefer uninstall operations     |
   | zmedico | when available.                                              |

   | 14129   | In Scheduler._schedule_tasks_imp(), add uninstall operations |
   | zmedico | to the front of the merge queue.                             |

   | 14130   | Bug #282306 - Inside dblink._find_libs_to_preserve(), fall   |
   | zmedico | back to utf_8 encoding if a path cannot be encoded under the |
   |         | user's chosen encoding. This fixes the traceback shown in    |
   |         | bug 282115, comment #6.                                      |

svn path=/main/branches/prefix/; revision=14145

17 years ago Merged from trunk -r14117:14127
Fabian Groffen [Mon, 24 Aug 2009 09:40:49 +0000 (09:40 -0000)]
   Merged from trunk -r14117:14127

   | 14118    | Note that package.* and use.* as directories is only        |
   | zmedico  | supported since portage-2.1.6.7, and it is not included in  |
   |          | PMS at this time.                                           |

   | 14119    | Avoid potential empty lines in warnings about missing       |
   | arfrever | SONAMEs or NEEDED entries. Found by Zac Medico.             |

   | 14120    | Add support for --selective=n, so it can be used to remove  |
   | zmedico  | selective behavior that may have been implied by some other |
   |          | option like --update.                                       |

   | 14121    | Add support for --keep-going=n so that it can be disabled   |
   | zmedico  | on the command line after it's been enabled in              |
   |          | EMERGE_DEFAULT_OPTS.                                        |

   | 14122    | Add some --debug output for backtracking. Also, remove      |
   | zmedico  | unused imports.                                             |

   | 14124    | Bug #282269 - Avoid str() calls with overlay paths, which   |
   | zmedico  | can trigger UnicodeEncodeError in python-2.x.               |

   | 14125    | Bug #282306 - Inside dblink._security_check(), fall back to |
   | zmedico  | utf_8 encoding it a path cannot be encoded under the user's |
   |          | chosen encoding.                                            |

   | 14126    | Bug #282269, comment #2 - Avoid potential                   |
   | zmedico  | UnicodeEncodeError when writing to sys.stderr inside        |
   |          | xtermTitle().                                               |

   | 14127    | Support package.provided directory.                         |
   | arfrever |                                                             |

svn path=/main/branches/prefix/; revision=14144

17 years ago Merged from trunk -r14107:14117
Fabian Groffen [Mon, 24 Aug 2009 09:38:13 +0000 (09:38 -0000)]
   Merged from trunk -r14107:14117

   | 14108    | Use _encodings where appropriate.                           |
   | zmedico  |                                                             |

   | 14109    | Use _encodings where appropriate.                           |
   | zmedico  |                                                             |

   | 14110    | Use _encodings where appropriate.                           |
   | zmedico  |                                                             |

   | 14111    | Use _encodings where appropriate and add                    |
   | zmedico  | _encodings['stdio'] for stdout encoding.                    |

   | 14112    | Fix typo.                                                   |
   | zmedico  |                                                             |

   | 14113    | Replace _content_encoding, _fs_encoding, and                |
   | zmedico  | _merge_encoding with direct usage of _encodings.            |

   | 14114    | Support QA_DT_HASH_${ARCH} and QA_PRESTRIPPED_${ARCH} (bug  |
   | arfrever | #271416).                                                   |

   | 14115    | Add support for QA_SONAME variable (bug #281964). Add       |
   | arfrever | support for QA_NEEDED variable.                             |

   | 14116    | Improve an example. Patch by Jeremy Olexa.                  |
   | arfrever |                                                             |

   | 14117    | Rename QA_NEEDED to QA_DT_NEEDED.                           |
   | arfrever |                                                             |

svn path=/main/branches/prefix/; revision=14143

17 years ago Merged from trunk -r14097:14107
Fabian Groffen [Mon, 24 Aug 2009 09:36:42 +0000 (09:36 -0000)]
   Merged from trunk -r14097:14107

   | 14098    | Use _encodings['repo.content'] for decoding profiles.desc,  |
   | zmedico  | ChangeLog, metadata.xml, and ebuilds.                       |

   | 14099    | Use _encodings where appropriate.                           |
   | zmedico  |                                                             |

   | 14100    | Use _encodings where appropriate.                           |
   | zmedico  |                                                             |

   | 14101    | Use _encodings where appropriate.                           |
   | zmedico  |                                                             |

   | 14102    | If sys.getdefaultencoding() returns None (this can happen   |
   | zmedico  | if python is built with USE=build, in stage 1), fall back   |
   |          | to _encodings['merge'] = 'ascii'.                           |

   | 14103    | Fix typo from previous commit.                              |
   | zmedico  |                                                             |

   | 14104    | Fix portage.5 man page to document the fact that some files |
   | arfrever | in profiles directory can be directories.                   |

   | 14105    | Use _encodings where appropriate.                           |
   | zmedico  |                                                             |

   | 14106    | Use _encodings where appropriate.                           |
   | zmedico  |                                                             |

   | 14107    | Use _encodings where appropriate.                           |
   | zmedico  |                                                             |

svn path=/main/branches/prefix/; revision=14142

17 years ago Merged from trunk -r14087:14097
Fabian Groffen [Mon, 24 Aug 2009 09:34:26 +0000 (09:34 -0000)]
   Merged from trunk -r14087:14097

   | 14088   | Use _content_encoding where appropriate.                     |
   | zmedico |                                                              |

   | 14089   | Use the new portage.output._init(config_root) function.      |
   | zmedico |                                                              |

   | 14090   | Use _content_encoding and _fs_encoding, and use strict       |
   | zmedico | unicode exceptions where appropriate.                        |

   | 14091   | Replace the _{content,fs,merge}_encoding attributes with an  |
   | zmedico | _encodings dict.                                             |

   | 14092   | Use errors='backslashreplace' instead of 'replace' for the   |
   | zmedico | default _unicode_encode() argument ('replace' substitutes    |
   |         | '?', which is not as useful).                                |

   | 14093   | Use portage.os and _encodings['fs'] where appropriate.       |
   | zmedico |                                                              |

   | 14094   | Use portage.os and _encodings where appropriate.             |
   | zmedico |                                                              |

   | 14095   | Use portage.os and _encodings where appropriate.             |
   | zmedico |                                                              |

   | 14096   | Remove unused os import.                                     |
   | zmedico |                                                              |

   | 14097   | Use portage.os and _encodings where appropriate.             |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=14141

17 years ago Merged from trunk -r14077:14087
Fabian Groffen [Mon, 24 Aug 2009 09:31:55 +0000 (09:31 -0000)]
   Merged from trunk -r14077:14087

   | 14078   | Use portage.os, _content_encoding, and _fs_encoding where    |
   | zmedico | appropriate.                                                 |

   | 14079   | Enable error='strict' when encoding arguments inside         |
   | zmedico | _unicode_func_wrapper(), and document behavior.              |

   | 14080   | Use portage.os, _content_encoding, and _fs_encoding where    |
   | zmedico | appropriate.                                                 |

   | 14081   | Bug #277619 - Fix news item relevance logic. Thanks to Alec  |
   | zmedico | Warner <antarus@gentoo.org> for this patch.                  |

   | 14082   | Use st_* attributes instead of the stat module.              |
   | zmedico |                                                              |

   | 14083   | Implement lazy loading of color.map when either the codes or |
   | zmedico | _styles attribute is accessed. This provides and             |
   |         | _init(config_root='/') function that the prefix branch can   |
   |         | use to substitute an appropriate config_root value at        |
   |         | runtime.                                                     |

   | 14084   | Use _content_encoding and _fs_encoding where appropriate.    |
   | zmedico |                                                              |

   | 14085   | Use _content_encoding and _fs_encoding where appropriate.    |
   | zmedico | Also, enable strict exceptions for unicode encoding          |
   |         | failures.                                                    |

   | 14086   | Bug #270866 - Validate News-Item-Format headers.             |
   | zmedico |                                                              |

   | 14087   | Don't wrap os.popen().                                       |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=14139

17 years ago Merged from trunk -r14067:14077
Fabian Groffen [Mon, 24 Aug 2009 09:28:51 +0000 (09:28 -0000)]
   Merged from trunk -r14067:14077

   | 14068    | Use elog in _eapi0_pkg_nofetch().                           |
   | zmedico  |                                                             |

   | 14069    | sets/files.py cleanPackages function stop calling lock and  |
   | volkmar  | load and requires the caller to do that changing unmerge to |
   |          | reflect this change                                         |

   | 14070    | Scheduler is now able to clean world set when removing a    |
   | volkmar  | package. world_atom function has been updated and           |
   |          | PackageUninstall is calling it after unmerge.               |

   | 14071    | Use a clean listener system for portage.elog instead of     |
   | volkmar  | _emerge_elog_listener                                       |

   | 14072    | Use _content_encoding and _fs_encoding for unicode          |
   | zmedico  | encoding/decoding.                                          |

   | 14073    | When _unicode_func_wrapper() decodes a string in a returned |
   | zmedico  | list (typically from os.listdir), discard values with       |
   |          | invalid encoding. This insures that all names returned from |
   |          | all os.listdir() calls are valid.                           |

   | 14074    | Use portage.os and _fs_encoding where appropriate, and fix  |
   | zmedico  | binary string handling for py3k compat.                     |

   | 14075    | Print a warning when nonexistent files have been passed to  |
   | arfrever | dohtml.                                                     |

   | 14076    | Add 'return False' which was missing from the previous      |
   | arfrever | commit.                                                     |

   | 14077    | Test the edge case.                                         |
   | zmedico  |                                                             |

svn path=/main/branches/prefix/; revision=14138

17 years ago Merged from trunk -r14057:14067
Fabian Groffen [Mon, 24 Aug 2009 09:27:07 +0000 (09:27 -0000)]
   Merged from trunk -r14057:14067

   | 14058    | Fix dblink._unmerge_pkgfiles() to use the correct version   |
   | zmedico  | of perform_md5 when it falls back to utf8 encoding.         |

   | 14059    | In perform_checksum(), encode the filename with correct     |
   | zmedico  | encoding before passing to spawn (for prelink), and enable  |
   |          | strict encoding behavior in _perform_md5_merge().           |

   | 14060    | Make _generate_hash_function() use _fs_encoding to encode   |
   | zmedico  | the filename (if it's not already encoded), and enable      |
   |          | errors='strict'.                                            |

   | 14061    | Make movefile() use process.spawn() instead of              |
   | zmedico  | getstatusoutput() when calling MOVE_BINARY, since spawn     |
   |          | will pass encoded file paths directly as arguments.         |

   | 14062    | Update import to import portage.os (with unicode wrappers), |
   | zmedico  | and use _unicode_encode() and _content_encoding for         |
   |          | encoding unicode env vars in spawn().                       |

   | 14063    | Remove ACCEPT_PROPERTIES variable generation code which     |
   | zmedico  | isn't needed since, unlike ACCEPT_LICENSE,                  |
   |          | ACCEPT_PROPERTIES isn't passed into the ebuild environment. |

   | 14064    | Fix typo.                                                   |
   | zmedico  |                                                             |

   | 14065    | Remove ACCEPT_PROPERTIES filtering since it's filtered on   |
   | zmedico  | the python side.                                            |

   | 14067    | Prepare 308 messages to localization.                       |
   | arfrever |                                                             |

svn path=/main/branches/prefix/; revision=14137

17 years ago Merged from trunk -r14047:14057
Fabian Groffen [Mon, 24 Aug 2009 09:20:57 +0000 (09:20 -0000)]
   Merged from trunk -r14047:14057

   | 14048   | Revert r14042 since we're not going to use it.               |
   | zmedico |                                                              |

   | 14049   | In dblink._unmerge_pkgfiles(), if the package appears to     |
   | zmedico | have been merged with a different value of                   |
   |         | sys.getfilesystemencoding(), fall back to utf_8 if           |
   |         | appropriate.                                                 |

   | 14050   | Inside dblink.treewalk(), handle filenames with incorrect    |
   | zmedico | encoding like we do after src_install. The check needs to be |
   |         | repeated here for binary packages (it's inexpensive since we |
   |         | call os.walk() here anyway).                                 |

   | 14051   | Update imports to import portage.os (with unicode wrappers). |
   | zmedico |                                                              |

   | 14052   | Update imports to import portage.os (with unicode wrappers), |
   | zmedico | and use _unicode_encode() and _unicode_decode() where        |
   |         | appropriate.                                                 |

   | 14053   | Use portage._fs_encoding where applicable.                   |
   | zmedico |                                                              |

   | 14054   | Handle UnicodeDecodeError for os.walk() inside               |
   | zmedico | digestcheck().                                               |

   | 14055   | Use portage._fs_encoding where appropriage, and use strict   |
   | zmedico | handling for errors.                                         |

   | 14056   | Add a portage._content_encoding constant, set to utf_8.      |
   | zmedico |                                                              |

   | 14057   | Fix broken _selinux_merge definition.                        |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=14136

17 years agomake EROOT readonly too, since it should be set by Portage only, like ED
Fabian Groffen [Sat, 15 Aug 2009 17:50:21 +0000 (17:50 -0000)]
make EROOT readonly too, since it should be set by Portage only, like ED

svn path=/main/branches/prefix/; revision=14066

17 years ago Merged from trunk -r14028:14042
Fabian Groffen [Fri, 14 Aug 2009 20:57:11 +0000 (20:57 -0000)]
   Merged from trunk -r14028:14042

   | 14029   | Rename and log installed files that don't conform to         |
   | zmedico | portage._merge_encoding (equal to                            |
   |         | sys.getfilesystemencoding()).                                |

   | 14034   | Don't hold references to config instances, since all that's  |
   | zmedico | really needed is $ROOT.                                      |

   | 14042   | Add a clean_world attribute.                                 |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=14047

17 years ago Merged from trunk -r14018:14028
Fabian Groffen [Fri, 14 Aug 2009 20:56:01 +0000 (20:56 -0000)]
   Merged from trunk -r14018:14028

   | 14019   | Create portage._merge_encoding and a corresponding _os_merge |
   | zmedico | wrapper that will later be used for all the merge code.      |

   | 14020   | Use portage's selinux wrapper module for mkdir calls.        |
   | zmedico |                                                              |

   | 14021   | Make _ensure_default_encoding() provide a fallback for the   |
   | zmedico | codec returned by sys.getfilesystemencoding().               |

   | 14022   | Replace the selinux.spawn() function with a spawn_wrapper()  |
   | zmedico | function and use it inside portage._spawn_fetch() and        |
   |         | portage.spawn().                                             |

   | 14023   | Don't use the unicode-wrapped os and shutil modules here     |
   | zmedico | since the whole _selinux module itself will be wrapped.      |

   | 14024   | Add an 'encoding' parameter to movefile(), so that we can    |
   | zmedico | make it obey sys.getfilesystemencoding() when called for     |
   |         | merge/unmerge.                                               |

   | 14025   | Make sure portage.selinux and _selinux exist, even when      |
   | zmedico | import fails, so that 'from portage import selinux' never    |
   |         | fails inside vartree.py.                                     |

   | 14026   | Don't 'del sys.modules["selinux"]' when selinux support      |
   | zmedico | isn't enabled in the portage config, because that just       |
   |         | assumes too much.                                            |

   | 14027   | Use portage._merge_encoding to encode/decode all filenames   |
   | zmedico | during merge/unmerge operations.                             |

   | 14028   | _merge_encoding = sys.getfilesystemencoding()                |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=14046

17 years ago Merged from trunk -r14008:14018
Fabian Groffen [Fri, 14 Aug 2009 20:54:36 +0000 (20:54 -0000)]
   Merged from trunk -r14008:14018

   | 14009   | Use _unicode_encode() where appropriate.                     |
   | zmedico |                                                              |

   | 14010   | Call _ensure_default_encoding() ASAP since writemsg() might  |
   | zmedico | not work without it.                                         |

   | 14011   | Use _unicode_encode() and _unicode_decode() where            |
   | zmedico | appropriate.                                                 |

   | 14012   | Bug #281133 - Fix the here-document code inside run_checks() |
   | zmedico | to properly detect the end of a here-document when it is     |
   |         | indented by whitespace.                                      |

   | 14013   | Use r'' for regex.                                           |
   | zmedico |                                                              |

   | 14014   | Set a limit of 30 backtracking attempts, since it's possible |
   | zmedico | for it to go out of control and take an unreasonable amount  |
   |         | of time.                                                     |

   | 14015   | Bug #281355 - Handle IndexError inside                       |
   | zmedico | reconstruct_eclasses().                                      |

   | 14016   | Add py3k support to _unicode_decode().                       |
   | zmedico |                                                              |

   | 14017   | Add support for unwrapped/overridden attributes in           |
   | zmedico | _unicode_module_wrapper().                                   |

   | 14018   | Add support for an 'encoding' parameter to                   |
   | zmedico | _unicode_module_wrapper(). This will allow creation of       |
   |         | specialize wrappers for merge/unmerge, in case the value of  |
   |         | sys.getfilesystemencoding() is something other than utf_8.   |

svn path=/main/branches/prefix/; revision=14045

17 years ago Merged from trunk -r13998:14008
Fabian Groffen [Fri, 14 Aug 2009 20:53:24 +0000 (20:53 -0000)]
   Merged from trunk -r13998:14008

   | 13999   | Update imports to import portage.os (with unicode wrappers), |
   | zmedico | and use _unicode_encode() and _unicode_decode() where        |
   |         | appropriate.                                                 |

   | 14000   | Filter ACCEPT_PROPERTIES from the ebuild environment, since  |
   | zmedico | unlike ACCEPT_LICENSE (used by check_license in              |
   |         | eutils.eclass), ACCEPT_PROPERTIES should never be needed in  |
   |         | the ebuild environment.                                      |

   | 14001   | Wrap portage.data.lchown() for unicode support in            |
   | zmedico | python-2.x.                                                  |

   | 14002   | Update imports to import portage.os (with unicode wrappers), |
   | zmedico | and use _unicode_encode() and _unicode_decode() where        |
   |         | appropriate.                                                 |

   | 14003   | Update imports to import portage.os (with unicode wrappers), |
   | zmedico | and use _unicode_encode() and _unicode_decode() where        |
   |         | appropriate.                                                 |

   | 14004   | Update imports to import portage.os (with unicode wrappers), |
   | zmedico | and use _unicode_encode() and _unicode_decode() where        |
   |         | appropriate.                                                 |

   | 14005   | Show a traceback when spawn() fails.                         |
   | zmedico |                                                              |

   | 14006   | Implement ObjectProxy.__int__().                             |
   | zmedico |                                                              |

   | 14007   | Update imports to import portage.os (with unicode wrappers), |
   | zmedico | and use _unicode_encode() and _unicode_decode() where        |
   |         | appropriate.                                                 |

   | 14008   | Use a single sys.hexversion conditional for both             |
   | zmedico | _unicode_func_wrapper() and _unicode_module_wrapper().       |

svn path=/main/branches/prefix/; revision=14044

17 years ago Merged from trunk -r13988:13998
Fabian Groffen [Fri, 14 Aug 2009 20:51:39 +0000 (20:51 -0000)]
   Merged from trunk -r13988:13998

   | 13989   | Bug #280460 - Wrap portage.os with unicode encode/decode     |
   | zmedico | wrappers.                                                    |

   | 13990   | Fix unicode support for compatibility with the new wrapped   |
   | zmedico | os module, and use _unicode_decode() and _unicode_encode()   |
   |         | where appropriate.                                           |

   | 13991   | Fix breakage from previous commit.                           |
   | zmedico |                                                              |

   | 13992   | Avoid using the wrapped os.read(), in order to avoid         |
   | zmedico | differing behavior between python-2.x (with wrapper) and     |
   |         | py3k (without wrapper). This sort of mismatch only applies   |
   |         | to os functions that return raw bytes under py3k, rather     |
   |         | than unicode.                                                |

   | 13993   | Update imports to import portage.os (with unicode wrappers), |
   | zmedico | and use _unicode_encode() and _unicode_decode() where        |
   |         | appropriate.                                                 |

   | 13994   | Update imports to import portage.os (with unicode wrappers), |
   | zmedico | and use _unicode_encode() and _unicode_decode() where        |
   |         | appropriate.                                                 |

   | 13995   | Update imports to import portage.os (with unicode wrappers), |
   | zmedico | and use _unicode_encode() and _unicode_decode() where        |
   |         | appropriate.                                                 |

   | 13996   | Update imports to import portage.os and portage.shutil (with |
   | zmedico | unicode wrappers), and use _unicode_encode() where           |
   |         | appropriate.                                                 |

   | 13997   | Add ACCEPT_PROPERTIES variable which has default value * and |
   | volkmar | can be set in make.conf or /etc/portage/package.properties.  |
   |         | If ACCEPT_PROPERTIES doesn't match ebuild PROPERTIES, the    |
   |         | ebuild is masked.                                            |

   | 13998   | Temporarily delete the os and shutil imports, to ensure that |
   | zmedico | only the wrapped versions are imported by portage internals. |

svn path=/main/branches/prefix/; revision=14043

17 years agono longer try to install xpack, it was removed
Fabian Groffen [Fri, 14 Aug 2009 20:28:31 +0000 (20:28 -0000)]
no longer try to install xpack, it was removed

svn path=/main/branches/prefix/; revision=14041

17 years ago Merged from trunk -r13978:13988
Fabian Groffen [Fri, 14 Aug 2009 20:26:56 +0000 (20:26 -0000)]
   Merged from trunk -r13978:13988

   | 13979   | Add portage ImportError sys.path insertion.                  |
   | zmedico |                                                              |

   | 13980   | This is an old emerge profiling script that probably doesn't |
   | zmedico | work.                                                        |

   | 13981   | This is a commandline interface to pkgsplit() that probably  |
   | zmedico | isn't used by anyone. We can add a function like this to     |
   |         | portageq.                                                    |

   | 13982   | This old script does checksums on installed files. People    |
   | zmedico | use equery for this now.                                     |

   | 13983   | This script is obsolete since manifest 2.                    |
   | zmedico |                                                              |

   | 13984   | This is an obsolete shell script for applying package moves  |
   | zmedico | vardb entry.                                                 |

   | 13985   | This definitely obsolete.                                    |
   | zmedico |                                                              |

   | 13986   | This is an uneeded script for parsing ldd output.            |
   | zmedico |                                                              |

   | 13987   | Add portage ImportError sys.path insertion.                  |
   | zmedico |                                                              |

   | 13988   | This is an unused commandline interface to xpak.xpak().      |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=14040

17 years ago Merged from trunk -r13968:13978
Fabian Groffen [Fri, 14 Aug 2009 20:24:14 +0000 (20:24 -0000)]
   Merged from trunk -r13968:13978

   | 13969   | Tweak $ROOT handling inside depgraph._add_pkg_deps() for     |
   | zmedico | removal actions, so --with-bdeps works correctly with        |
   |         | --depclean and --prune.                                      |

   | 13970   | In calc_depclean(), sort packages that are displayed due to  |
   | zmedico | being pulled in by link level dependencies.                  |

   | 13971   | Don't trigger the --root-deps code for removal actions such  |
   | zmedico | as --prune and --depclean.                                   |

   | 13972   | Fix PreservedLibsRegistry.pruneNonExisting() to work with    |
   | zmedico | $ROOT.                                                       |

   | 13973   | Use writemsg_stdout() for safe unicode output of             |
   | zmedico | --list-sets.                                                 |

   | 13974   | Bug #280962 - Fix broken path normalization inside           |
   | zmedico | StaticFileSet.multiBuilder().                                |

   | 13975   | Open new items in text mode (unicode), and safely handle     |
   | zmedico | unicode in news item names.                                  |

   | 13977   | Bug #280998 - Misc selinux fixes. Thanks to Chris PeBenito   |
   | zmedico | <pebenito@gentoo.org> for this patch.                        |

   | 13978   | Bug #280460 - Wrap os and os.path modules with unicode       |
   | zmedico | encode/decode wrappers for python-2.x.                       |

svn path=/main/branches/prefix/; revision=14039

17 years ago Merged from trunk -r13967:13968
Fabian Groffen [Fri, 14 Aug 2009 20:22:25 +0000 (20:22 -0000)]
   Merged from trunk -r13967:13968

   | 13968   | Inside calc_depclean(), use LinkageMap.findConsumers() for   |
   | zmedico | checking intersection of files being removed with providers  |
   |         | in the LinkageMap (a KeyError is raised when there is no     |
   |         | intersection).                                               |

svn path=/main/branches/prefix/; revision=14038

17 years ago Merged from trunk -r13957:13967
Fabian Groffen [Fri, 14 Aug 2009 20:21:04 +0000 (20:21 -0000)]
   Merged from trunk -r13957:13967

   | 13958   | Inside collect_ebuild_messages(), open elog files in text    |
   | zmedico | mode (unicode). Thanks to jlec for reporting.                |

   | 13959   | Bug #280690 - Fix incorrect idendification of start quote as |
   | zmedico | end quote when the start quote is immediately followed by a  |
   |         | newline.                                                     |

   | 13960   | Always use encoding='utf_8' for unicode() calls.             |
   | zmedico |                                                              |

   | 13961   | Write log files in text mode (unicode). Thanks to Arfrever   |
   | zmedico | for reporting.                                               |

   | 13962   | Encode unicode messages as bytes in order to avoid TypeError |
   | zmedico | from syslog.syslog() with python-2.x.                        |

   | 13963   | Fix typo in comment. Thanks to Arfrever.                     |
   | zmedico |                                                              |

   | 13964   | Fix EOutput to safely write unicode to stderr/stdout. Thanks |
   | zmedico | to Arfrever for reporting.                                   |

   | 13965   | Make everything safe for unicode (this should fix the elog   |
   | zmedico | modules that send mail).                                     |

   | 13966   | Remove unused import.                                        |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=14037

17 years agoConvert scanmacho/readpecoff output to unicode inside LinkageMapXXXXXX.rebuild().
Fabian Groffen [Fri, 14 Aug 2009 20:19:16 +0000 (20:19 -0000)]
Convert scanmacho/readpecoff output to unicode inside LinkageMapXXXXXX.rebuild().

svn path=/main/branches/prefix/; revision=14036

17 years ago Merged from trunk -r13956:13957
Fabian Groffen [Fri, 14 Aug 2009 20:16:55 +0000 (20:16 -0000)]
   Merged from trunk -r13956:13957

   | 13957   | Convert scanelf output to unicode inside                     |
   | zmedico | LinkageMap.rebuild().                                        |

svn path=/main/branches/prefix/; revision=14035

17 years ago Merged from trunk -r13949:13956
Fabian Groffen [Fri, 14 Aug 2009 20:14:21 +0000 (20:14 -0000)]
   Merged from trunk -r13949:13956

   | 13950   | In Task.__str__(), emulate tuple.__str__, but don't show     |
   | zmedico | 'foo' as u'foo' for unicode strings.                         |

   | 13951   | Simplify command introspection inside usage().               |
   | zmedico |                                                              |

   | 13952   | Move global portage import to the top and add writemsg and   |
   | zmedico | writemsg_stdout imports for safe unicode output.             |

   | 13953   | Use writemsg_stdout() for safe unicode output.               |
   | zmedico |                                                              |

   | 13954   | Add missing noiselevel argument in writemsg_stdout() calls.  |
   | zmedico |                                                              |

   | 13955   | Use writemsg_stdout() for safe unicode output.               |
   | zmedico |                                                              |

   | 13956   | Use writemsg_stdout() for safe display of unicode overlay    |
   | zmedico | paths.                                                       |

svn path=/main/branches/prefix/; revision=14033

17 years ago Merged from trunk -r13939:13949
Fabian Groffen [Fri, 14 Aug 2009 20:05:47 +0000 (20:05 -0000)]
   Merged from trunk -r13939:13949

   | 13940   | Fix filter_loglevels() and filter_phases() to work with      |
   | zmedico | unicode.                                                     |

   | 13941   | Make getconfig() return unicode type and remove              |
   | zmedico | corresponding env_update() workaround from bug #280460.      |

   | 13942   | In shlex_split(), don't encode unicode for py3k. Thanks to   |
   | zmedico | Arfrever.                                                    |

   | 13943   | In getconfig(), specify utf_8 encoding for py3k.             |
   | zmedico |                                                              |

   | 13944   | Make spawn decode unicode in order to avoid a potential      |
   | zmedico | UnicodeEncodeError from os.execve().                         |

   | 13945   | Convert environment variables to unicode inside the config   |
   | zmedico | constructor, in order to avoid potential UnicodeDecodeError  |
   |         | exceptions later.                                            |

   | 13946   | In config.__setitem__(), convert keys/values to unicode in   |
   | zmedico | order to avoid potential UnicodeDecodeError exceptions       |
   |         | later.                                                       |

   | 13947   | Open repo_name in text mode (unicode).                       |
   | zmedico |                                                              |

   | 13948   | Use writemsg_stdout() for safe unicode output.               |
   | zmedico |                                                              |

   | 13949   | Account for hardlinks when computing SIZE metadata.          |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=14032

17 years ago Merged from trunk -r13929:13939
Fabian Groffen [Fri, 14 Aug 2009 20:03:05 +0000 (20:03 -0000)]
   Merged from trunk -r13929:13939

   | 13930    | Convert paths to unicode when working with CONTENTS.        |
   | zmedico  |                                                             |

   | 13931    | Add unicode conversions in various logging code.            |
   | zmedico  |                                                             |

   | 13932    | Convert unicode if necessary before writing to stdout.      |
   | zmedico  |                                                             |

   | 13933    | Inside _post_src_install_uid_fix() (since we're already     |
   | zmedico  | walking the files here), compute total size of installed    |
   |          | files and save it as SIZE in the vardb. This will be useful |
   |          | for the packagekit backend.                                 |

   | 13934    | Bug #277544 - Add missing -c switch in bzip2 arguments.     |
   | zmedico  | Thanks to MichaÅ‚ Górny <gentoo@mgorny.alt.pl> for the     |
   |          | patch.                                                      |

   | 13935    | Bug #277537 - Synchronize order of PATH elements with the   |
   | zmedico  | order defined by /etc/profile (promote paths under /usr to  |
   |          | the front). Thanks to MichaÅ‚ Górny                        |
   |          | <gentoo@mgorny.alt.pl>.                                     |

   | 13936    | Implement nonfatal().                                       |
   | arfrever |                                                             |

   | 13937    | Bug #280521 - Update selinux support to use the libselinux  |
   | zmedico  | swig wrapper api instead of python-selinux. Thanks to Chris |
   |          | PeBenito <pebenito@gentoo.org> for the initial patch which  |
   |          | I've tweaked with whitespace changes and unicode support.   |

   | 13938    | Filter PORTAGE_NONFATAL from the environment where          |
   | zmedico  | appropriate.                                                |

   | 13939    | Add a new portage.util.shlex_split() function to wrap all   |
   | zmedico  | shlex.split() calls, since shlex.split() doesn't behave     |
   |          | well with unicode strings.                                  |

svn path=/main/branches/prefix/; revision=14031

17 years ago Merged from trunk -r13919:13929
Fabian Groffen [Fri, 14 Aug 2009 19:52:13 +0000 (19:52 -0000)]
   Merged from trunk -r13919:13929

   | 13920   | correct pointer, as pointed out by darkside in IRC           |
   | grobian |                                                              |

   | 13921   | Bug #280460 - Fix UnicodeDecodeError in env_update() due to  |
   | zmedico | non-unicode strings from getconfig(). TODO: Make getconfig() |
   |         | return unicode.                                              |

   | 13924   | Fix UnicodeEncodeError in                                    |
   | zmedico | vardbapi._owners_cache._hash_str(), reported by jlec on irc. |

   | 13925   | Fix transposition of CodecInfo streamreader and streamwriter |
   | zmedico | attributes inside _gen_missing_encodings(). This solves      |
   |         | 'TypeError: an integer is required' exceptions from          |
   |         | codecs.open().readlines([sizehint]), triggered when python   |
   |         | is built with USE=build (stage 1). Thanks to Daniel Robbins  |
   |         | for reporting.                                               |

   | 13926   | Do not pass unicode strings into os.walk calls, since it can |
   | zmedico | cause internal os.path.join calls to raise                   |
   |         | UnicodeDecodeError.                                          |

   | 13927   | Remove odd os.getcwd() call used inside main() when          |
   | zmedico | searching for tests.                                         |

   | 13928   | Use realpath to resolve __file__ when searching for test     |
   | zmedico | inside main().                                               |

   | 13929   | Fix broken os.walk call in _post_src_install_uid_fix().      |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=14030

17 years ago Merged from trunk -r13909:13919
Fabian Groffen [Wed, 5 Aug 2009 18:11:44 +0000 (18:11 -0000)]
   Merged from trunk -r13909:13919

   | 13910   | Avoid UnicodeEncodeError with unicode package.mask comments. |
   | zmedico | Thanks to Thanks to Scott Moreau (soreau) for reporting.     |

   | 13911   | Fix bindbapi.aux_get and aux_update to work with             |
   | zmedico | py3k/unicode.                                                |

   | 13912   | Open all files in binary mode for py3k compatibility.        |
   | zmedico |                                                              |

   | 13913   | Open file in text mode (unicode) where appropriate.          |
   | zmedico |                                                              |

   | 13914   | In _check_build_log(), open the log in text mode (unicode).  |
   | zmedico |                                                              |

   | 13915   | Open ld.so.conf as text (unicode).                           |
   | zmedico |                                                              |

   | 13916   | Fix the FEATURES=parse-eapi-ebuild-head regex to handle      |
   | zmedico | comments on the same line, like this: EAPI=2 #foo Thanks to  |
   |         | Markus Meier <maekke@gentoo.org> for reporting.              |

   | 13917   | s/utf8/utf_8/ for consistency                                |
   | zmedico |                                                              |

   | 13919   | Fix insert_optional_args() to properly handle thinks like    |
   | zmedico | -Dk which require multiple substitutions of default          |
   |         | arguments.                                                   |

svn path=/main/branches/prefix/; revision=13923

17 years ago Merged from trunk -r13895:13909
Fabian Groffen [Wed, 5 Aug 2009 18:10:06 +0000 (18:10 -0000)]
   Merged from trunk -r13895:13909

   | 13898   | Bug #280275 - Fix exception: AttributeError: 'config' object |
   | zmedico | has no attribute '_license_groups'.                          |

   | 13900   | Avoid UnicodeEncodeError in writemsg(). Thanks to Markos     |
   | zmedico | Chandras <hwoarang@gentoo.org> for reporting.                |

   | 13901   | Open log files in text mode (to avoid UnicodeEncodeError).   |
   | zmedico | Thanks to Markos Chandras <hwoarang@gentoo.org> for          |
   |         | reporting.                                                   |

   | 13902   | Open CONTENTS in text mode (to avoid UnicodeEncodeError).    |
   | zmedico | Thanks to Markos Chandras <hwoarang@gentoo.org> for          |
   |         | reporting.                                                   |

   | 13903   | Bug #280269 - Fix StaticFileSet.multiBuilder() to handle     |
   | zmedico | unicode filenames.                                           |

   | 13904   | Bug #280269 - Decode commandline arguments to unicode when   |
   | zmedico | necessary.                                                   |

   | 13905   | Bug #280269 - Fix Atom.__str__ so that it doesn't try to     |
   | zmedico | encode a unicode string (resulting in UnicodeEncodeError).   |
   |         | If an Atom instance is passed into the constructor, just     |
   |         | return the given instance.                                   |

   | 13906   | Decode arguments to unicode if necessary (needed at least    |
   | zmedico | for unicode file names passed to the owners command).        |

   | 13907   | Always return unicode from vardbapi.aux_get().               |
   | zmedico |                                                              |

   | 13908   | Fix tar_contents() to open files in binary mode for py3k     |
   | zmedico | compatibility.                                               |

   | 13909   | Fix vardbapi._aux_get() to always return unicode.            |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=13922

17 years ago Merged from trunk -r13887:13895
Fabian Groffen [Tue, 4 Aug 2009 17:00:19 +0000 (17:00 -0000)]
   Merged from trunk -r13887:13895

   | 13888   | Fix a regression caused by the code from bug #278729, which  |
   | zmedico | causes incorrect preference evaluation for cases like        |
   |         | kde-base/nepomuk: || (                                       |
   |         | >=dev-libs/soprano-2.3.0[clucene,dbus,raptor,redland]        |
   |         | >=dev-libs/soprano-2.3.0[clucene,dbus,raptor,java] ) In      |
   |         | cases like this we need to prefer the choice which is        |
   |         | already satisfied by current USE configuration. Thanks to    |
   |         | Maciej Mrozowski <reavertm@poczta.fm> for reporting.         |

   | 13889   | Bug #280259 - Use codecs.open() when reading the Packages    |
   | zmedico | file inside binarytree.inject(), in order to avoid a         |
   |         | UnicodeDecodeError when the file is later written as a       |
   |         | unicode stream (via atomic_ofstream).                        |

   | 13890   | Bug #280259 - Fix binarytree to always open the Packages     |
   | zmedico | file as unicode.                                             |

   | 13891   | Bug #280259 - Fix emaint to call binarytree._load_pkgindex() |
   | zmedico | for unicode handling.                                        |

   | 13892   | Fix dep_zapdeps exception 'ValueError: need more than 3      |
   | zmedico | values to unpack' from r13888.                               |

   | 13893   | In the dep_zapdeps() code from bug #278729, set              |
   | zmedico | all_use_satisfied = False if the choice includes an          |
   |         | unavailable package.                                         |

   | 13894   | Revert the code from bug #278729 for now since it need to be |
   | zmedico | redone in order to account for the issue described in        |
   |         | comment #3.                                                  |

   | 13895   | Bug #280320 - Fix broken _emerge.main ImportError handler..  |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=13899

17 years ago Merged from trunk -r13874:13887
Fabian Groffen [Tue, 4 Aug 2009 16:29:35 +0000 (16:29 -0000)]
   Merged from trunk -r13874:13887

   | 13879    | Remove the code from bug #278895 since we're going to need  |
   | zmedico  | a daemon process in the ebuild's login session in order to  |
   |          | pass signals from the controlling terminal to the detached  |
   |          | session. A simple fifo-based approach in ebuild.sh does not |
   |          | seem to work since bash's read builtin occasionally loses   |
   |          | the fifo data when it's 'Interrupted system call'. Maybe a  |
   |          | python script will work better for the session              |
   |          | leader/daemon. NOTE: The daemon will also be useful for     |
   |          | implementing a fifo-based die helper (to replace the        |
   |          | current signal- based approach).                            |

   | 13880    | Bug #278729 - Add an Atom.without_use attribute which is    |
   | zmedico  | identical to the atom itself, except without any USE        |
   |          | dependencies.                                               |

   | 13881    | Bug #278729 - Inside dep_zapdeps(), ignore USE dependencies |
   | zmedico  | since we don't want USE settings to adversely affect ||     |
   |          | preference evaluation. Drop invalid atoms inside            |
   |          | _expand_new_virtuals() since we only want real Atom         |
   |          | instances inside dep_zapdeps().                             |

   | 13882    | Make the USE=test RDEPEND check (bug #236786) also apply to |
   | zmedico  | PDEPEND.                                                    |

   | 13883    | Fix NameError from r13880. Thanks to Arfrever for           |
   | zmedico  | reporting.                                                  |

   | 13884    | Add a PDEPEND.suspect category.                             |
   | zmedico  |                                                             |

   | 13887    | Set "emerge" xterm title at the beginning of running        |
   | arfrever | emerge.                                                     |

svn path=/main/branches/prefix/; revision=13897

17 years agoallow retrieval of rootuser through the environment
Fabian Groffen [Tue, 4 Aug 2009 16:24:14 +0000 (16:24 -0000)]
allow retrieval of rootuser through the environment

svn path=/main/branches/prefix/; revision=13896

17 years agotry to introduce some readability/efficiency, and try to fix backtrace when no make...
Fabian Groffen [Mon, 3 Aug 2009 17:48:09 +0000 (17:48 -0000)]
try to introduce some readability/efficiency, and try to fix backtrace when no make.profile is there or it is invalid

svn path=/main/branches/prefix/; revision=13878

17 years agouse OUR python, not some python that might not even exist
Fabian Groffen [Mon, 3 Aug 2009 15:51:47 +0000 (15:51 -0000)]
use OUR python, not some python that might not even exist

svn path=/main/branches/prefix/; revision=13877

17 years ago Merged from trunk -r13865:13874
Fabian Groffen [Sun, 2 Aug 2009 14:32:04 +0000 (14:32 -0000)]
   Merged from trunk -r13865:13874

|13870  |In the _check_build_log(), exclude output from dev-libs/yaz-3.0.47     |
|zmedico|which looks like this: Configuration: Automake: ${SHELL}               |
|       |/var/tmp/portage/dev-libs/yaz-3.0.47/work/yaz-3.0.47/config/missing    |
|       |--run automake-1.10 Thanks to Robin H. Johnson <robbat2@gentoo.org> for|
|       |reporting.                                                             |

|13872  |Add support for --complete-graph=n so that it's possible to disable it |
|zmedico|on the command line after it's been enabled in EMERGE_DEFAULT_OPTS.    |

|13873  |Add support for --usepkg=n so that it's possible to disable it on the  |
|zmedico|command line after it's been enabled in EMERGE_DEFAULT_OPTS. Also do   |
|       |the same for --usepkgonly, --getbinpkg, and --getbinpkgonly.           |

|13874  |Only treat non-negative integers as valid in insert_optional_args().   |
|zmedico|                                                                       |

svn path=/main/branches/prefix/; revision=13876

17 years agofix bad substitution in pym/portage/const_autotool.py (disappearing backslashes)...
Fabian Groffen [Sun, 2 Aug 2009 14:27:30 +0000 (14:27 -0000)]
fix bad substitution in pym/portage/const_autotool.py (disappearing backslashes), bug #279550

svn path=/main/branches/prefix/; revision=13875

17 years agoDepersonalise this a bit
Fabian Groffen [Sat, 1 Aug 2009 10:01:19 +0000 (10:01 -0000)]
Depersonalise this a bit

svn path=/main/branches/prefix/; revision=13871

17 years ago Merged from trunk -r13857:13865
Fabian Groffen [Fri, 31 Jul 2009 07:41:14 +0000 (07:41 -0000)]
   Merged from trunk -r13857:13865

   | 13858   | Add get_updated_config_files in portage API                  |
   | volkmar | chk_updated_cfg_files in _emerge API is now using            |
   |         | get_updated_config_files It lets other app to get updated    |
   |         | config files without ouputs                                  |

   | 13859   | Rename get_updated_config_files() to                         |
   | zmedico | find_updated_config_files() and make it an iterator of       |
   |         | tuples.                                                      |

   | 13860   | Updating find_updated_config_files function description      |
   | volkmar |                                                              |

   | 13861   | Move the setsid code (from bug #278895) as early as          |
   | zmedico | possible.                                                    |

   | 13862   | Fix breakage in owners() handling of abs paths.              |
   | zmedico |                                                              |

   | 13863   | Add a python-based setsid script for use with USERLAND=BSD.  |
   | zmedico |                                                              |

   | 13864   | Bug #276264 - Advise manual removal of the metadata/cache/   |
   | zmedico | direcory when using eclass-overrides.                        |

   | 13865   | In depgraph._show_slot_collision_notice(), display $ROOT (if |
   | zmedico | not /) with each slot atom.                                  |

svn path=/main/branches/prefix/; revision=13869

17 years ago Merged from trunk -r13854:13857
Fabian Groffen [Fri, 31 Jul 2009 07:38:05 +0000 (07:38 -0000)]
   Merged from trunk -r13854:13857

   | 13855   | Fix depgraph._show_missed_update() to keep each $ROOT        |
   | zmedico | separate.                                                    |

   | 13856   | Bug #278895 - Make ebuild.sh clean up orphaned processes     |
   | zmedico | that may have been left behind by ebuild phases. This works  |
   |         | by using setsid to create a new login session for the        |
   |         | ebuild.sh process, and `kill -s SIGHUP 0` to send a SIGHUP   |
   |         | signal to all processes in the session. The setsid is        |
   |         | currently not done on the python side since that would cause |
   |         | the sandbox process in the session, and sandbox produces a   |
   |         | warning message if it catches a SIGHUP signal.               |

   | 13857   | Inside die(), only send the signal for subshell die support  |
   | zmedico | when we are actually in a subshell.                          |

svn path=/main/branches/prefix/; revision=13868

17 years ago Merged from trunk -r13849:13854
Fabian Groffen [Fri, 31 Jul 2009 07:36:27 +0000 (07:36 -0000)]
   Merged from trunk -r13849:13854

   | 13850   | Bug #270040 - Make repoman parse the categories file from    |
   | zmedico | the overlay.                                                 |

   | 13851   | Fix --onlydeps breakage. Thanks to Arfrever for reporting.   |
   | zmedico |                                                              |

   | 13852   | When backtracking due to an unsatisfied dependency, show a   |
   | zmedico | normal unsatisfied dependency message for the given atom.    |
   |         | Thanks to Thomas Sachau <tommy@gentoo.org> for reporting.    |

   | 13853   | Remove redundant loop inside                                 |
   | zmedico | depgraph._show_missed_update_slot_conflicts().               |

   | 13854   | Account for $ROOT inside                                     |
   | zmedico | depgraph._show_missed_update_unsatisfied_dep().              |

svn path=/main/branches/prefix/; revision=13867

17 years agoTry to fix bug #279550 (the backtrace that is), apparently we still use some old...
Fabian Groffen [Fri, 31 Jul 2009 07:34:04 +0000 (07:34 -0000)]
Try to fix bug #279550 (the backtrace that is), apparently we still use some old syntax.  Disable the normal gentoo error message for now as two is a bit too much.

svn path=/main/branches/prefix/; revision=13866

17 years agoAdd preserve-libs support for Interix and Windows. Original patch by Markus Duft.
Fabian Groffen [Wed, 22 Jul 2009 18:08:31 +0000 (18:08 -0000)]
Add preserve-libs support for Interix and Windows.  Original patch by Markus Duft.

svn path=/main/branches/prefix/; revision=13849

17 years ago Merged from trunk -r13839:13846
Fabian Groffen [Wed, 22 Jul 2009 17:35:55 +0000 (17:35 -0000)]
   Merged from trunk -r13839:13846

   | 13840   | Use a lazy reference to sys.stdout, in case the API consumer |
   | zmedico | has temporarily overridden stdout.                           |

   | 13841   | Move mtimedb resume list code from action_build() to         |
   | zmedico | Scheduler._save_resume_list().                               |

   | 13842   | Skip Blocker instances inside _add_prefetchers().            |
   | zmedico |                                                              |

   | 13843   | Remove empty log files inside dblink.unmerge(). Thanks to    |
   | zmedico | Diego Pettenò <flameeyes@gentoo.org> for reporting.         |

   | 13844   | FEATURES=unmerge-logs Keep logs from successful unmerge      |
   | zmedico | phases. This is relevant only when PORT_LOGDIR is set.       |
   |         | Thanks to Diego Pettenò <flameeyes@gentoo.org> for the      |
   |         | suggestion.                                                  |

   | 13845   | Always pass encodings='utf_8' to codecs.open(), since        |
   | zmedico | otherwise it can return non-unicode strings (at least in     |
   |         | some cases, observed with python-2.6.2). Don't use unicode   |
   |         | in portage.util.getconfig() for now, since shlex doesn't     |
   |         | seem to support it (spurious \0 characters). If we use       |
   |         | unicode for config variables, it breaks shlex.split() calls  |
   |         | on those variables due to the same issue (spurious \0        |
   |         | characters).                                                 |

   | 13846   | Add comment in calc_depclean() about topological sort        |
   | zmedico | optimization that minimizes issues with implicit deps.       |

svn path=/main/branches/prefix/; revision=13848