Improve and update repos watching

2 files changed, 12 insertions, 10 deletions

diff --git a/changesources.py b/changesources.py
index 2b7fb82..fcddaec 100644
--- a/changesources.py
+++ b/changesources.py
@@ -16,11 +16,12 @@ def setup(c, config):
 
     if config.get("sub_repos_changes", True):
         for repo in repos.get_sub_repos():
-            poller = GitPoller(repo.url,
-                               project="sugar-build",
-                               branches=[repo.branch],
-                               pollinterval=pollinterval)
-            c["change_source"].append(poller)
+            if repo.branch:
+                poller = GitPoller(repo.url,
+                                   project="sugar-build",
+                                   branches=[repo.branch],
+                                   pollinterval=pollinterval)
+                c["change_source"].append(poller)
 
     def codebaseGenerator(change_dict):
         repository = change_dict["repository"]
diff --git a/repos.py b/repos.py
index 8d648f6..d6d401a 100644
--- a/repos.py
+++ b/repos.py
@@ -2,12 +2,13 @@ import json
 
 
 class Repo:
-    def __init__(self, name, url, branch=None):
+    def __init__(self, name, url, branch, tag):
         self.name = name
         self.url = url
         self.branch = branch
+        self.tag = tag
 
-        if self.branch is None:
+        if self.branch is None and self.tag is None:
             self.branch = "master"
 
 
@@ -30,7 +31,7 @@ def load_modules(path):
     for module in json.load(open(path)):
         sub_repos.append(Repo(name=module["name"],
                               url=module["repo"],
-                              branch=module.get("branch", None)))
+                              branch=module.get("branch", None),
+                              tag=module.get("tag", None)))
 
-load_modules("modules/sugar.json")
-load_modules("modules/activities.json")
+load_modules("build/config/dependencies.json")