Merge pull request #19 from MeeGoIntegration/build-trial-paths-hack

Avoid invalid paths in trial project meta Signed-off-by: David Greaves <[email protected]>
MeeGoIntegration · Sep 28, 2018 · 7fc4bf4 · 7fc4bf4
2 parents ae61827 + 4307fbb
commit 7fc4bf4
Showing 1 changed file with 2 additions and 15 deletions.
diff --git a/participants/setup_build_trial.py b/participants/setup_build_trial.py
@@ -296,30 +296,21 @@ def remove_invalid_paths(self, trial_project, extra_paths, targets):
                     targets.remove(project)
 
     def construct_trial(self, trial_project, actions, extra_path=None, extra_links=None, exclude_repos=[], exclude_archs=[], exclude_links=None):
-        print "construct_trial", trial_project, actions, extra_path, extra_links, exclude_repos, exclude_archs, exclude_links
-
         mechanism = "localdep"
         targets = set([act['targetproject'] for act in actions])
         if not targets and extra_path:
             targets.add(extra_path)
         if exclude_links:
             targets = targets - exclude_links
-        print "targets", targets
         repolinks, extra_paths, flags = self.calculate_trial(targets, exclude_repos, exclude_archs, extra_path=extra_path)
-        print "repolinks", repolinks
-        print "extra_paths", extra_paths
-        print "flags", flags
 
         targets.update(set(path[0] for path in itertools.chain.from_iterable(extra_paths.values())))
         targets.update(extra_links)
         if exclude_links:
             targets = targets - exclude_links
-
-        print "targets", targets
+
         repolinks, extra_paths, flags = self.calculate_trial(targets, exclude_repos, exclude_archs, extra_path=extra_path)
-        print "repolinks", repolinks
-        print "extra_paths", extra_paths
-        print "flags", flags
+        self.remove_invalid_paths(trial_project, extra_paths, targets)
 
         self.remove_invalid_paths(trial_project, extra_paths, targets)
         print "extra_paths cleaned", extra_paths
@@ -335,11 +326,7 @@ def construct_trial(self, trial_project, actions, extra_path=None, extra_links=N
             raise RuntimeError("Something went wrong while creating build trial project %s" % trial_project)
 
         extra_paths = self.add_self_refs(trial_project, repolinks, extra_paths)
-        print "self ref extra_paths", extra_paths
-        print "flags", flags
-
         self.remove_invalid_paths(trial_project, extra_paths, targets)
-        print "self ref extra_paths cleaned", extra_paths
 
         result = self.obs.createProject(trial_project, repolinks,
                                         links=targets,