diff options
| -rw-r--r-- | manifest_xml.py | 6 | ||||
| -rw-r--r-- | project.py | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/manifest_xml.py b/manifest_xml.py index 4f752122..b26b0cac 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
| @@ -435,11 +435,6 @@ class XmlManifest: | |||
| 435 | self.parent_groups = parent_groups | 435 | self.parent_groups = parent_groups |
| 436 | self.default_groups = default_groups | 436 | self.default_groups = default_groups |
| 437 | 437 | ||
| 438 | if outer_client and self.isGitcClient: | ||
| 439 | raise ManifestParseError( | ||
| 440 | "Multi-manifest is incompatible with `gitc-init`" | ||
| 441 | ) | ||
| 442 | |||
| 443 | if submanifest_path and not outer_client: | 438 | if submanifest_path and not outer_client: |
| 444 | # If passing a submanifest_path, there must be an outer_client. | 439 | # If passing a submanifest_path, there must be an outer_client. |
| 445 | raise ManifestParseError(f"Bad call to {self.__class__.__name__}") | 440 | raise ManifestParseError(f"Bad call to {self.__class__.__name__}") |
| @@ -2290,7 +2285,6 @@ class RepoClient(XmlManifest): | |||
| 2290 | submanifest_path: The submanifest root relative to the repo root. | 2285 | submanifest_path: The submanifest root relative to the repo root. |
| 2291 | **kwargs: Additional keyword arguments, passed to XmlManifest. | 2286 | **kwargs: Additional keyword arguments, passed to XmlManifest. |
| 2292 | """ | 2287 | """ |
| 2293 | self.isGitcClient = False | ||
| 2294 | submanifest_path = submanifest_path or "" | 2288 | submanifest_path = submanifest_path or "" |
| 2295 | if submanifest_path: | 2289 | if submanifest_path: |
| 2296 | self._CheckLocalPath(submanifest_path) | 2290 | self._CheckLocalPath(submanifest_path) |
| @@ -1462,8 +1462,6 @@ class Project: | |||
| 1462 | self._InitHooks() | 1462 | self._InitHooks() |
| 1463 | 1463 | ||
| 1464 | def _CopyAndLinkFiles(self): | 1464 | def _CopyAndLinkFiles(self): |
| 1465 | if self.client.isGitcClient: | ||
| 1466 | return | ||
| 1467 | for copyfile in self.copyfiles: | 1465 | for copyfile in self.copyfiles: |
| 1468 | copyfile._Copy() | 1466 | copyfile._Copy() |
| 1469 | for linkfile in self.linkfiles: | 1467 | for linkfile in self.linkfiles: |
