[jhbuild/jhdebuild: 529/536] [jhdebuild] Don't have seperate do_deb_ codepath

[John Carr <johncarr src gnome org>]

commit e3ff90218da1bf8057ac55f19d5c8ca094f4125f
Author: John Carr <john carr unrouted co uk>
Date:   Sun May 17 17:33:38 2009 +0100

    [jhdebuild] Don't have seperate do_deb_ codepath
---
 jhbuild/modtypes/__init__.py |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/jhbuild/modtypes/__init__.py b/jhbuild/modtypes/__init__.py
index 1d3164a..fc72379 100644
--- a/jhbuild/modtypes/__init__.py
+++ b/jhbuild/modtypes/__init__.py
@@ -236,13 +236,8 @@ class Package:
         return None
 
     def skip_phase(self, buildscript, phase, last_phase):
-        if buildscript.config.debuild:
-            skip_prefix = 'skip_deb_'
-        else:
-            skip_prefix = 'skip_'
-
         try:
-            skip_phase_method = getattr(self, skip_prefix + phase)
+            skip_phase_method = getattr(self, 'skip_' + phase)
         except AttributeError:
             return False
         return skip_phase_method(buildscript, last_phase)
@@ -253,12 +248,7 @@ class Package:
         Returns a tuple of the following form:
           (error-flag, [other-phases])
         """
-        if buildscript.config.debuild:
-            do_prefix = 'do_deb_'
-        else:
-            do_prefix = 'do_'
-
-        method = getattr(self, do_prefix + phase)
+        method = getattr(self, 'do_' + phase)
         try:
             method(buildscript)
         except (CommandError, BuildStateError), e: