From elliot at rpath.com  Fri Jul 22 10:57:34 2011
From: elliot at rpath.com (Elliot Peele)
Date: Fri, 22 Jul 2011 14:57:34 +0000
Subject: mirrorball: support for sles hae
Message-ID: <201107221457.p6MEvYQY006636@scc.eng.rpath.com>

changeset:   d64979756cc3
user:        Elliot Peele <https://issues.rpath.com/>
date:        Fri, 22 Jul 2011 10:57:14 -0400

support for sles hae

diff --git a/scripts/order_import.py b/scripts/order_import.py
--- a/scripts/order_import.py
+++ b/scripts/order_import.py
@@ -59,7 +59,7 @@
     elif cfg.platformName == 'centos':
         from errata.centos import AdvisoryManager as Errata
 
-    elif cfg.platformName == 'sles11':
+    elif cfg.platformName in ('sles11', 'sles11sp1hae'):
         from errata.sles11 import AdvisoryManager11 as Errata
 
     else:
diff --git a/scripts/order_promote.py b/scripts/order_promote.py
--- a/scripts/order_promote.py
+++ b/scripts/order_promote.py
@@ -47,7 +47,7 @@
     if cfg.platformName == 'sles':
         from errata.sles import AdvisoryManager as Errata
 
-    elif cfg.platformName == 'sles11':
+    elif cfg.platformName in ('sles11', 'sles11sp1hae'):
         from errata.sles11 import AdvisoryManager11 as Errata
 
     elif cfg.platformName == 'centos':
diff --git a/scripts/order_update.py b/scripts/order_update.py
--- a/scripts/order_update.py
+++ b/scripts/order_update.py
@@ -57,7 +57,7 @@
     if cfg.platformName == 'sles':
         from errata.sles import AdvisoryManager as Errata
 
-    elif cfg.platformName == 'sles11':
+    elif cfg.platformName in ('sles11', 'sles11sp1hae'):
         from errata.sles11 import AdvisoryManager11 as Errata
 
     elif cfg.platformName == 'centos':
diff --git a/scripts/platform-order.py b/scripts/platform-order.py
--- a/scripts/platform-order.py
+++ b/scripts/platform-order.py
@@ -29,7 +29,7 @@
 
     if cfg.platformName == 'sles':
         from errata.sles import AdvisoryManager as Errata
-    elif cfg.platformName == 'sles11':
+    elif cfg.platformName in ('sles11', 'sles11sp1hae'):
         from errata.sles11 import AdvisoryManager11 as Errata
     elif cfg.platformName == 'centos':
         from errata.centos import AdvisoryManager as Errata
diff --git a/updatebot/build/build.py b/updatebot/build/build.py
--- a/updatebot/build/build.py
+++ b/updatebot/build/build.py
@@ -547,6 +547,7 @@
             # Check if this looks like a kernel module source rpm that wasn't
             # handled by the last two checks.
             elif '-kmod' in name or '-kmp' in name:
+                log.error('raising error for kernel module package %s' % name)
                 raise UnhandledKernelModule(name=name)
 
             # All other packages.
diff --git a/updatebot/build/dispatcher.py b/updatebot/build/dispatcher.py
--- a/updatebot/build/dispatcher.py
+++ b/updatebot/build/dispatcher.py
@@ -55,6 +55,8 @@
         Check if all jobs are complete.
         """
 
+        log.info('waiting for the following jobs: %s' % ','.join(map(str, self._jobs.keys())))
+
         if not len(self._jobs):
             return False
 

From elliot at rpath.com  Fri Jul 22 10:57:34 2011
From: elliot at rpath.com (Elliot Peele)
Date: Fri, 22 Jul 2011 14:57:34 +0000
Subject: mirrorball: branch merge
Message-ID: <201107221457.p6MEvYQU006663@scc.eng.rpath.com>

changeset:   ea13900299f4
user:        Elliot Peele <https://issues.rpath.com/>
date:        Fri, 22 Jul 2011 10:57:32 -0400

branch merge

diff --git a/scripts/order_import.py b/scripts/order_import.py
--- a/scripts/order_import.py
+++ b/scripts/order_import.py
@@ -59,7 +59,7 @@
     elif cfg.platformName == 'centos':
         from errata.centos import AdvisoryManager as Errata
 
-    elif cfg.platformName == 'sles11':
+    elif cfg.platformName in ('sles11', 'sles11sp1hae'):
         from errata.sles11 import AdvisoryManager11 as Errata
 
     else:
diff --git a/scripts/order_promote.py b/scripts/order_promote.py
--- a/scripts/order_promote.py
+++ b/scripts/order_promote.py
@@ -47,7 +47,7 @@
     if cfg.platformName == 'sles':
         from errata.sles import AdvisoryManager as Errata
 
-    elif cfg.platformName == 'sles11':
+    elif cfg.platformName in ('sles11', 'sles11sp1hae'):
         from errata.sles11 import AdvisoryManager11 as Errata
 
     elif cfg.platformName == 'centos':
diff --git a/scripts/order_update.py b/scripts/order_update.py
--- a/scripts/order_update.py
+++ b/scripts/order_update.py
@@ -57,7 +57,7 @@
     if cfg.platformName == 'sles':
         from errata.sles import AdvisoryManager as Errata
 
-    elif cfg.platformName == 'sles11':
+    elif cfg.platformName in ('sles11', 'sles11sp1hae'):
         from errata.sles11 import AdvisoryManager11 as Errata
 
     elif cfg.platformName == 'centos':
diff --git a/scripts/platform-order.py b/scripts/platform-order.py
--- a/scripts/platform-order.py
+++ b/scripts/platform-order.py
@@ -29,7 +29,7 @@
 
     if cfg.platformName == 'sles':
         from errata.sles import AdvisoryManager as Errata
-    elif cfg.platformName == 'sles11':
+    elif cfg.platformName in ('sles11', 'sles11sp1hae'):
         from errata.sles11 import AdvisoryManager11 as Errata
     elif cfg.platformName == 'centos':
         from errata.centos import AdvisoryManager as Errata
diff --git a/updatebot/build/build.py b/updatebot/build/build.py
--- a/updatebot/build/build.py
+++ b/updatebot/build/build.py
@@ -547,6 +547,7 @@
             # Check if this looks like a kernel module source rpm that wasn't
             # handled by the last two checks.
             elif '-kmod' in name or '-kmp' in name:
+                log.error('raising error for kernel module package %s' % name)
                 raise UnhandledKernelModule(name=name)
 
             # All other packages.
diff --git a/updatebot/build/dispatcher.py b/updatebot/build/dispatcher.py
--- a/updatebot/build/dispatcher.py
+++ b/updatebot/build/dispatcher.py
@@ -55,6 +55,8 @@
         Check if all jobs are complete.
         """
 
+        log.info('waiting for the following jobs: %s' % ','.join(map(str, self._jobs.keys())))
+
         if not len(self._jobs):
             return False