diff options
Diffstat (limited to 'gitc_utils.py')
-rw-r--r-- | gitc_utils.py | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/gitc_utils.py b/gitc_utils.py index a2786c9f..486bbeb0 100644 --- a/gitc_utils.py +++ b/gitc_utils.py | |||
@@ -77,22 +77,6 @@ def _set_project_revisions(projects): | |||
77 | project.revisionExpr = revisionExpr | 77 | project.revisionExpr = revisionExpr |
78 | 78 | ||
79 | 79 | ||
80 | def _manifest_groups(manifest): | ||
81 | """Returns the manifest group string that should be synced | ||
82 | |||
83 | This is the same logic used by Command.GetProjects(), which is used during | ||
84 | repo sync | ||
85 | |||
86 | Args: | ||
87 | manifest: The XmlManifest object | ||
88 | """ | ||
89 | mp = manifest.manifestProject | ||
90 | groups = mp.config.GetString('manifest.groups') | ||
91 | if not groups: | ||
92 | groups = 'default,platform-' + platform.system().lower() | ||
93 | return groups | ||
94 | |||
95 | |||
96 | def generate_gitc_manifest(gitc_manifest, manifest, paths=None): | 80 | def generate_gitc_manifest(gitc_manifest, manifest, paths=None): |
97 | """Generate a manifest for shafsd to use for this GITC client. | 81 | """Generate a manifest for shafsd to use for this GITC client. |
98 | 82 | ||
@@ -107,7 +91,7 @@ def generate_gitc_manifest(gitc_manifest, manifest, paths=None): | |||
107 | if paths is None: | 91 | if paths is None: |
108 | paths = list(manifest.paths.keys()) | 92 | paths = list(manifest.paths.keys()) |
109 | 93 | ||
110 | groups = [x for x in re.split(r'[,\s]+', _manifest_groups(manifest)) if x] | 94 | groups = [x for x in re.split(r'[,\s]+', manifest.GetGroupsStr()) if x] |
111 | 95 | ||
112 | # Convert the paths to projects, and filter them to the matched groups. | 96 | # Convert the paths to projects, and filter them to the matched groups. |
113 | projects = [manifest.paths[p] for p in paths] | 97 | projects = [manifest.paths[p] for p in paths] |
@@ -166,7 +150,7 @@ def save_manifest(manifest, client_dir=None): | |||
166 | else: | 150 | else: |
167 | manifest_file = os.path.join(client_dir, '.manifest') | 151 | manifest_file = os.path.join(client_dir, '.manifest') |
168 | with open(manifest_file, 'w') as f: | 152 | with open(manifest_file, 'w') as f: |
169 | manifest.Save(f, groups=_manifest_groups(manifest)) | 153 | manifest.Save(f, groups=manifest.GetGroupsStr()) |
170 | # TODO(sbasi/jorg): Come up with a solution to remove the sleep below. | 154 | # TODO(sbasi/jorg): Come up with a solution to remove the sleep below. |
171 | # Give the GITC filesystem time to register the manifest changes. | 155 | # Give the GITC filesystem time to register the manifest changes. |
172 | time.sleep(3) | 156 | time.sleep(3) |