provide a multi branch name for the git-obs-map xml file. ex) <branch name="tizen... 83/61183/4
authorYonghee Han <onstudy@samsung.com>
Fri, 4 Mar 2016 08:29:16 +0000 (17:29 +0900)
committerpark <sk7.park@samsung.com>
Fri, 4 Mar 2016 22:05:12 +0000 (14:05 -0800)
Change-Id: I8f5e4573fb5224a5f0c434feb2f7582c85b09e03
(cherry picked from commit 5e89e677e0e4f01d1e9e330525a56cab3a0565ed)

common/mapping.py

index 6aa81ee..8d7ba05 100644 (file)
@@ -155,7 +155,7 @@ class MappingV2(object):
         if self.mapping_obj.branch:
             for brch in self.mapping_obj.branch:
                 for prj in brch.project:
-                    if (prj.name == project or prj.name == '/' + project) and brch.name == branch:
+                    if (prj.name == project or prj.name == '/' + project) and ( branch in brch.name.split(",") ):
                         mapping.append(self.__encode_to_ascii([brch.OBS_project, brch.OBS_staging_project, prj.OBS_package]))
             return mapping