Revert "roomservice: Do not overwrite existing repositories"
This reverts commit 4d7506379d9d1f7e91b5f18996acb94373bdd9e3.
Change-Id: If5cd569641438467916afccd8b0da2f898af3757
diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py
index c7162cc..6e20d37 100755
--- a/build/tools/roomservice.py
+++ b/build/tools/roomservice.py
@@ -194,35 +194,12 @@
})
return project
-
-# Avoid adding already in manifests declared repositories in the roomservice.xml
-def is_in_manifest(project):
- files = []
- for file in os.listdir(local_manifest_dir):
- if file.endswith(".xml") and file != "roomservice.xml":
- files.append(os.path.join(local_manifest_dir, file))
- files.append('.repo/manifest.xml')
- for file in files:
- try:
- man = ES.parse(file)
- man = man.getroot()
- for project_in_manifests in man.findall("project"):
- if project_in_manifests.get("path") == project.get("path") or project_in_manifests.get("path") == project.get("target_path"): # path -> def append_to_manifest(project) & target_path -> def check_manifest_problems(dependencies)
- return True
- except (IOError, ES.ParseError):
- print("WARNING: error while parsing %s" % file)
- return False
-
-
def append_to_manifest(project):
try:
lm = ES.parse('/'.join([local_manifest_dir, "roomservice.xml"]))
lm = lm.getroot()
except (IOError, ES.ParseError):
lm = ES.Element("manifest")
- if is_in_manifest(project):
- print("HINT: The following repository is already defined in a manifest:", project.get("name"))
- return lm
lm.append(project)
return lm
@@ -284,9 +261,6 @@
# delete the roomservice.xml file and create new
def check_manifest_problems(dependencies):
for dependency in dependencies:
- if is_in_manifest(dependency):
- continue
-
repository = dependency.get("repository")
target_path = dependency.get("target_path")
revision = dependency.get("revision", default_rev)
@@ -319,7 +293,7 @@
revision = dependency.get("revision", default_rev)
remote = dependency.get("remote", default_rem)
override = dependency.get("override", None)
-
+
if override is not None:
#print("found override in ", repository)
project = create_remove_project(repository)
@@ -395,7 +369,7 @@
def fetch_device(device):
if check_device_exists(device):
- print("HINT: Avoid fetching the already checked out device repo:", device)
+ print("WARNING: Trying to fetch a device that's already there")
return
git_data = search_gerrit_for_device(device)
if git_data is not None: