fix: Archive app for different repo/app names

frappe · May 31, 2023 · 3af6058 · 3af6058
1 parent 3e448d4
commit 3af6058
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/bench/app.py b/bench/app.py
@@ -198,7 +198,7 @@ def get(self):
 
 	@step(title="Archiving App {repo}", success="App {repo} Archived")
 	def remove(self, no_backup: bool = False):
-		active_app_path = os.path.join("apps", self.repo)
+		active_app_path = os.path.join("apps", self.app_name)
 
 		if no_backup:
 			if not os.path.islink(active_app_path):
@@ -209,7 +209,7 @@ def remove(self, no_backup: bool = False):
 		else:
 			archived_path = os.path.join("archived", "apps")
 			archived_name = get_available_folder_name(
-				f"{self.repo}-{date.today()}", archived_path
+				f"{self.app_name}-{date.today()}", archived_path
 			)
 			archived_app_path = os.path.join(archived_path, archived_name)
 

diff --git a/bench/bench.py b/bench/bench.py
@@ -131,6 +131,9 @@ def uninstall(self, app, no_backup=False, force=False):
 		except InvalidRemoteException:
 			if not force:
 				raise
+		except ValueError:
+			pass
+
 		self.apps.sync()
 		# self.build() - removed because it seems unnecessary
 		self.reload(_raise=False)