From ec7ac481b4a78c12eb04afea53c34cddd495bebd Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Fri, 12 Feb 2016 12:33:48 +0000 Subject: Fix release scripts to not use 'sysbranchdir' https://storyboard.baserock.org/#!/story/71 Change-Id: I4862406d19c74cdd6135b52304474562aa3ba511 --- scripts/release-test | 5 ++--- scripts/release-upload | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/release-test b/scripts/release-test index ad9b2e0a..4dcc6f76 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 9e080fa7..106a6e49 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): -- cgit v1.2.1