summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-02-12 12:33:48 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-02-12 12:34:09 (GMT)
commitec7ac481b4a78c12eb04afea53c34cddd495bebd (patch)
tree44eebf18b17fa104ad2f133f568b772da27a6894 /scripts
parent86078b1ce1859495b40a016f75ebec382318de03 (diff)
downloaddefinitions-ec7ac481b4a78c12eb04afea53c34cddd495bebd.tar.gz
Fix release scripts to not use 'sysbranchdir'
https://storyboard.baserock.org/#!/story/71 Change-Id: I4862406d19c74cdd6135b52304474562aa3ba511
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/release-test5
-rwxr-xr-xscripts/release-upload5
2 files changed, 4 insertions, 6 deletions
diff --git a/scripts/release-test b/scripts/release-test
index ad9b2e0..4dcc6f7 100755
--- a/scripts/release-test
+++ b/scripts/release-test
@@ -38,9 +38,8 @@ import morphlib
class MorphologyHelper(object):
def __init__(self):
- self.sb = sb = morphlib.sysbranchdir.open_from_within('.')
- defs_repo_path = sb.get_git_directory_name(sb.root_repository_url)
- self.defs_repo = morphlib.gitdir.GitDirectory(defs_repo_path)
+ self.defs_repo = morphlib.definitions_repo.open(
+ '.', search_for_root=True)
self.loader = morphlib.morphloader.MorphologyLoader()
self.finder = morphlib.morphologyfinder.MorphologyFinder(self.defs_repo)
diff --git a/scripts/release-upload b/scripts/release-upload
index 9e080fa..106a6e4 100755
--- a/scripts/release-upload
+++ b/scripts/release-upload
@@ -277,9 +277,8 @@ class BuildArtifactPublisher(object):
return loader.load_from_string(morphology_text)
def get_morphology_finder_for_root_repository(self):
- sb = morphlib.sysbranchdir.open_from_within('.')
- definitions = sb.get_git_directory_name(sb.root_repository_url)
- definitions_repo = morphlib.gitdir.GitDirectory(definitions)
+ definitions_repo = morphlib.definitions_repo.open(
+ '.', search_for_root=True)
return morphlib.morphologyfinder.MorphologyFinder(definitions_repo)
def filter_away_build_artifacts_on_public_trove(self, basenames):