Skip to content

Commit 3e6403b

Browse files
committed
Fix existing repo logic
1 parent c8aa357 commit 3e6403b

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

myst_libre/tools/build_source_manager.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def create_build_dir_host(self):
3939
bool: True if directory created, else False.
4040
"""
4141
if not os.path.exists(self.build_dir):
42-
os.makedirs(self.build_dir)
42+
os.makedirs(self.build_dir, exist_ok=True)
4343
return True
4444
return False
4545

@@ -52,12 +52,14 @@ def git_clone_repo(self,clone_parent_directory):
5252
"""
5353
self.host_build_source_parent_dir = clone_parent_directory
5454
self.build_dir = os.path.join(self.host_build_source_parent_dir, self.username, self.repo_name, self.gh_repo_commit_hash)
55-
if self.create_build_dir_host():
56-
self.cprint(f'Cloning into {self.build_dir}', "green")
57-
self.repo_object = Repo.clone_from(f'{self.provider}/{self.gh_user_repo_name}', self.build_dir)
58-
else:
55+
56+
if os.path.exists(self.build_dir):
5957
self.cprint(f'Source {self.build_dir} already exists.', "yellow")
6058
self.repo_object = Repo(self.build_dir)
59+
else:
60+
os.makedirs(os.path.dirname(self.build_dir), exist_ok=True)
61+
self.cprint(f'Cloning into {self.build_dir}', "green")
62+
self.repo_object = Repo.clone_from(f'{self.provider}/{self.gh_user_repo_name}', self.build_dir)
6163

6264
self.set_commit_info()
6365
self.validate_commits()

myst_libre/tools/jupyter_hub_local_spawner.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,10 @@ def spawn_jupyter_hub(self,jb_build_command=None):
128128
self.cprint(f' ├───────── ✸ {self.rees.pull_image_name}','light_blue')
129129
self.cprint(f' ├───────── ⎌ {self.rees.binder_image_tag}','light_blue')
130130
self.cprint(f" ├───────── ⏲ {self.rees.binder_commit_info['datetime']}: {self.rees.binder_commit_info['message']}".replace('\n', ''),'light_blue')
131-
self.cprint(f' └───────── ℹ This image was built from REES-compliant {self.rees.gh_user_repo_name} repository at the commit above','yellow')
131+
if self.rees.binder_image_name:
132+
self.cprint(f' └───────── ℹ Using NeuroLibre base image {self.rees.binder_image_name}','yellow')
133+
else:
134+
self.cprint(f' └───────── ℹ This image was built from REES-compliant {self.rees.gh_user_repo_name} repository at the commit above','yellow')
132135
except Exception as e:
133136
logging.error(f'Could not spawn a JH: \n {e}')
134137

0 commit comments

Comments
 (0)