| 1 |
Author: zmedico |
| 2 |
Date: 2008-08-01 21:56:26 +0000 (Fri, 01 Aug 2008) |
| 3 |
New Revision: 11314 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/sets/profiles.py |
| 7 |
Log: |
| 8 |
Add debug support to PackagesSystemSet since robbat2 is reporting an empty |
| 9 |
set for some unknown reason. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/sets/profiles.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/sets/profiles.py 2008-08-01 11:16:40 UTC (rev 11313) |
| 15 |
+++ main/trunk/pym/portage/sets/profiles.py 2008-08-01 21:56:26 UTC (rev 11314) |
| 16 |
@@ -2,18 +2,22 @@ |
| 17 |
# Distributed under the terms of the GNU General Public License v2 |
| 18 |
# $Id$ |
| 19 |
|
| 20 |
+import logging |
| 21 |
import os |
| 22 |
from portage.util import grabfile_package, stack_lists |
| 23 |
from portage.sets.base import PackageSet |
| 24 |
+from portage.sets import get_boolean |
| 25 |
+from portage.util import writemsg_level |
| 26 |
|
| 27 |
__all__ = ["PackagesSystemSet"] |
| 28 |
|
| 29 |
class PackagesSystemSet(PackageSet): |
| 30 |
_operations = ["merge"] |
| 31 |
|
| 32 |
- def __init__(self, profile_paths): |
| 33 |
+ def __init__(self, profile_paths, debug=False): |
| 34 |
super(PackagesSystemSet, self).__init__() |
| 35 |
self._profile_paths = profile_paths |
| 36 |
+ self._debug = debug |
| 37 |
if profile_paths: |
| 38 |
description = self._profile_paths[-1] |
| 39 |
if description == "/etc/portage/profile" and \ |
| 40 |
@@ -24,10 +28,26 @@ |
| 41 |
self.description = "System packages for profile %s" % description |
| 42 |
|
| 43 |
def load(self): |
| 44 |
+ debug = self._debug |
| 45 |
+ if debug: |
| 46 |
+ writemsg_level("\nPackagesSystemSet: profile paths: %s\n" % \ |
| 47 |
+ (self._profile_paths,), level=logging.DEBUG, noiselevel=-1) |
| 48 |
+ |
| 49 |
mylist = [grabfile_package(os.path.join(x, "packages")) for x in self._profile_paths] |
| 50 |
+ |
| 51 |
+ if debug: |
| 52 |
+ writemsg_level("\nPackagesSystemSet: raw packages: %s\n" % \ |
| 53 |
+ (mylist,), level=logging.DEBUG, noiselevel=-1) |
| 54 |
+ |
| 55 |
mylist = stack_lists(mylist, incremental=1) |
| 56 |
+ |
| 57 |
+ if debug: |
| 58 |
+ writemsg_level("\nPackagesSystemSet: stacked packages: %s\n" % \ |
| 59 |
+ (mylist,), level=logging.DEBUG, noiselevel=-1) |
| 60 |
+ |
| 61 |
self._setAtoms([x[1:] for x in mylist if x[0] == "*"]) |
| 62 |
|
| 63 |
def singleBuilder(self, options, settings, trees): |
| 64 |
- return PackagesSystemSet(settings.profiles) |
| 65 |
+ debug = get_boolean(options, "debug", False) |
| 66 |
+ return PackagesSystemSet(settings.profiles, debug=debug) |
| 67 |
singleBuilder = classmethod(singleBuilder) |
Archives