This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 89ba8f2f60194ad004b1a0570e858db5245fb04a (commit) via 832b1857f2d060dcf99b4f08f46e64d070acbf03 (commit) from e454a6a0e72518a97856e63bfee0911ba9b2cd4e (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 89ba8f2f60194ad004b1a0570e858db5245fb04a Merge: e454a6a0e72518a97856e63bfee0911ba9b2cd4e 832b1857f2d060dcf99b4f08f46e64d070acbf03 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 19 22:45:56 2010 +0100

Merge branch 'naoki'

commit 832b1857f2d060dcf99b4f08f46e64d070acbf03 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 19 22:45:24 2010 +0100

naoki: Fix deptree resolution.

-----------------------------------------------------------------------

Summary of changes: naoki/__init__.py | 2 +- naoki/backend.py | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-)

Difference in files: diff --git a/naoki/__init__.py b/naoki/__init__.py index 1ea09fa..40ca83c 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 2764d44..0a12b5d 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 "<PackageInfo %s>" % 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 "<Package %s>" % 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()

hooks/post-receive -- IPFire 3.x development tree