From: Michael Tremer Date: Fri, 19 Mar 2010 21:45:24 +0000 (+0100) Subject: naoki: Fix deptree resolution. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=832b1857f2d060dcf99b4f08f46e64d070acbf03;p=ipfire-3.x.git naoki: Fix deptree resolution. --- diff --git a/naoki/__init__.py b/naoki/__init__.py index 1ea09fab6..40ca83cbc 100644 --- a/naoki/__init__.py +++ b/naoki/__init__.py @@ -146,7 +146,7 @@ Release : %(release)s print package.fmtstr("%(name)s") def call_package_tree(self, args): - print "TBD" + print backend.deptree(backend.parse_package(backend.get_package_names())) def call_package_groups(self, args): groups = backend.get_group_names() diff --git a/naoki/backend.py b/naoki/backend.py index 2764d44f6..0a12b5da2 100644 --- a/naoki/backend.py +++ b/naoki/backend.py @@ -167,6 +167,9 @@ class PackageInfo(object): self._name = name self.repo = repo + #def __cmp__(self, other): + # return cmp(self.name, other.name) + def __repr__(self): return "" % self.name @@ -225,7 +228,7 @@ class PackageInfo(object): def _dependencies(self, s, recursive=False): c = s + "_CACHE" if not self._data.has_key(c): - deps = parse_package_info(self._data.get(s).split(" ")) + deps = parse_package(self._data.get(s).split(" ")) self._data.update({c : depsolve(deps, recursive)}) return self._data.get(c) @@ -310,6 +313,12 @@ class Package(object): def __repr__(self): return "" % self.info.name + def __cmp__(self, other): + return cmp(self.name, other.name) + + def __getattr__(self, attr): + return getattr(self.info, attr) + def build(self): environment = chroot.Environment(self) environment.build()