Stop adding self-dependency to odlparent

Change jjb-init-project to no include odlparent as a circular dependency
on itself.

Change-Id: Ie343f34ac5d29c1b377257d14feeb83fc023b4fc
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index dfb20299e406d23026e87370769e339bab665462..2133475a4ff9e1f4b18cc288654a4dc050bf808f 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -130,13 +130,16 @@ if cfg.get('DEPENDENCIES'):
         dependencies = "odlparent," + dependencies
     disabled = "false"
 else:
-    dependencies = "odlparent"  # All projects depend on odlparent
+    dependencies = None
+    if project.project != "odlparent":  # Odlparent does not depend on itself
+        dependencies = "odlparent"  # All other projects depend on odlparent
     disabled = "false"
 
-email_prefix = (email_prefix + " " +
+if dependencies:
+    email_prefix = (email_prefix + " " +
                 " ".join(['[%s]' % d for d in dependencies.split(",")]))  # noqa
-dependent_jobs = ",".join(
-    ['%s-merge-{stream}' % d for d in dependencies.split(",")])
+    dependent_jobs = ",".join(
+        ['%s-merge-{stream}' % d for d in dependencies.split(",")])
 
 ############################
 # Handle ARCHIVE_ARTIFACTS #