[jhbuild/jhdebuild: 534/536] [jhdebuild] Move deb_start to debian.py

[John Carr <johncarr src gnome org>]

commit 9175e73c147225a57d146d8b24c587f11d8c9526
Author: John Carr <john carr unrouted co uk>
Date:   Sun May 17 18:52:35 2009 +0100

    [jhdebuild] Move deb_start to debian.py
---
 jhbuild/modtypes/__init__.py |   28 ----------------------------
 jhbuild/modtypes/debian.py   |   28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/jhbuild/modtypes/__init__.py b/jhbuild/modtypes/__init__.py
index f91d24b..52c6467 100644
--- a/jhbuild/modtypes/__init__.py
+++ b/jhbuild/modtypes/__init__.py
@@ -300,34 +300,6 @@ class Package:
             return True
         return False
 
-    def do_deb_start(self, buildscript):
-        buildscript.set_action('Starting building', self)
-        ext_dep = buildscript.config.external_dependencies.get(self.name)
-        if ext_dep:
-            available = self.get_available_debian_version(buildscript).split('-')[0]
-            if ':' in available: # remove epoch
-                available = available.split(':')[-1]
-
-            deb_available = [lax_int(x) for x in available.split('.')]
-            ext_minimum = [lax_int(x) for x in ext_dep.get('minimum').split('.')]
-            ext_recommended = [lax_int(x) for x in ext_dep.get('recommended').split('.')]
-
-            if deb_available >= ext_recommended:
-                buildscript.message('external dependency, available')
-                if not buildscript.config.build_external_deps == 'always':
-                    raise SkipToEnd()
-
-            if deb_available >= ext_minimum:
-                buildscript.message(
-                        'external dependency, available (but recommended version is not)')
-                if not buildscript.config.build_external_deps in ('always', 'recommended'):
-                    raise SkipToEnd()
-            else:
-                buildscript.message('external dependency, no version high enough')
-                if buildscript.config.build_external_deps == 'never':
-                    raise SkipToEnd()
-    do_deb_start.error_phases = []
-
     def xml_tag_and_attrs(self):
         """Return a (tag, attrs) pair, describing how to serialize this
         module.
diff --git a/jhbuild/modtypes/debian.py b/jhbuild/modtypes/debian.py
index 90b8c03..ee0e24c 100644
--- a/jhbuild/modtypes/debian.py
+++ b/jhbuild/modtypes/debian.py
@@ -18,6 +18,34 @@ class DebianBasePackage:
     PHASE_DINSTALL       = 'deb_dinstall'
     PHASE_UPGRADE        = 'deb_upgrade'
 
+    def do_deb_start(self, buildscript):
+        buildscript.set_action('Starting building', self)
+        ext_dep = buildscript.config.external_dependencies.get(self.name)
+        if ext_dep:
+            available = self.get_available_debian_version(buildscript).split('-')[0]
+            if ':' in available: # remove epoch
+                available = available.split(':')[-1]
+
+            deb_available = [lax_int(x) for x in available.split('.')]
+            ext_minimum = [lax_int(x) for x in ext_dep.get('minimum').split('.')]
+            ext_recommended = [lax_int(x) for x in ext_dep.get('recommended').split('.')]
+
+            if deb_available >= ext_recommended:
+                buildscript.message('external dependency, available')
+                if not buildscript.config.build_external_deps == 'always':
+                    raise SkipToEnd()
+
+            if deb_available >= ext_minimum:
+                buildscript.message(
+                        'external dependency, available (but recommended version is not)')
+                if not buildscript.config.build_external_deps in ('always', 'recommended'):
+                    raise SkipToEnd()
+            else:
+                buildscript.message('external dependency, no version high enough')
+                if buildscript.config.build_external_deps == 'never':
+                    raise SkipToEnd()
+    do_deb_start.error_phases = []
+
     def skip_deb_apt_get_update(self, buildscript, last_state):
         return False