[jhbuild: 3/27] fix skip_phase to pass the right object as buildscript
- From: Frederic Peters <fpeters src gnome org>
- To: svn-commits-list gnome org
- Subject: [jhbuild: 3/27] fix skip_phase to pass the right object as buildscript
- Date: Sat, 16 May 2009 09:37:02 -0400 (EDT)
commit 13b8ab5afadd610b84d1fb844cb48e750d35d444
Author: Frederic Peters <fpeters 0d be>
Date: Mon May 4 00:15:57 2009 +0200
fix skip_phase to pass the right object as buildscript
---
jhbuild/frontends/buildscript.py | 2 +-
jhbuild/modtypes/__init__.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/jhbuild/frontends/buildscript.py b/jhbuild/frontends/buildscript.py
index 24c0904..cfba97e 100644
--- a/jhbuild/frontends/buildscript.py
+++ b/jhbuild/frontends/buildscript.py
@@ -106,7 +106,7 @@ class BuildScript:
print 'phases:', phases
print ' current phase:', num_phase
last_phase, phase = phase, phases[num_phase]
- if module.skip_phase(phase, last_phase):
+ if module.skip_phase(self, phase, last_phase):
num_phase += 1
continue
diff --git a/jhbuild/modtypes/__init__.py b/jhbuild/modtypes/__init__.py
index c151e0c..5af1374 100644
--- a/jhbuild/modtypes/__init__.py
+++ b/jhbuild/modtypes/__init__.py
@@ -144,12 +144,12 @@ class Package:
def get_revision(self):
return None
- def skip_phase(self, phase, last_phase):
+ def skip_phase(self, buildscript, phase, last_phase):
try:
skip_phase_method = getattr(self, 'skip_' + phase)
except AttributeError:
return False
- return skip_phase_method(self, last_phase)
+ return skip_phase_method(buildscript, last_phase)
def run_phase(self, buildscript, phase):
"""run a particular part of the build for this package.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]