fix: apps init; apps might be an empty folder still

frappe · Nov 27, 2024 · 786b63d · 786b63d
1 parent cf3eec6
commit 786b63d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/bench/bench.py b/bench/bench.py
@@ -283,7 +283,7 @@ def initialize_apps(self):
 			]
 			self.apps.remove("frappe")
 			self.apps.insert(0, "frappe")
-		except FileNotFoundError:
+		except (FileNotFoundError, ValueError):
 			self.apps = []
 
 	def __getitem__(self, key):

diff --git a/bench/config/procfile.py b/bench/config/procfile.py
@@ -8,7 +8,10 @@
 from bench.utils import which
 
 
-def setup_procfile(bench_path, yes=False, skip_redis=False, skip_web=False, skip_watch=os.environ.get("CI"), skip_socketio=False, skip_schedule=False, with_coverage=False):
+def setup_procfile(bench_path, yes=False, skip_redis=False, skip_web=False, skip_watch=None, skip_socketio=False, skip_schedule=False, with_coverage=False):
+	if skip_watch is None:
+		# backwards compatibilty; may be eventually removed
+		skip_watch = os.environ.get("CI")
 	config = Bench(bench_path).conf
 	procfile_path = os.path.join(bench_path, "Procfile")
 
@@ -72,7 +75,7 @@ def main(bench_path, skip_redis, skip_web, skip_watch, skip_socketio, skip_sched
 	parser.add_argument("bench_path", help="The path to the bench directory.")
 	parser.add_argument("--skip-redis", action="store_true", help="Skip Redis configuration.")
 	parser.add_argument("--skip-web", action="store_true", help="Skip web server configuration.")
-	parser.add_argument("--skip-watch", action="store_true", default=os.environ.get("CI"), help="Skip watch process configuration.")
+	parser.add_argument("--skip-watch", action="store_true", help="Skip watch process configuration.")
 	parser.add_argument("--skip-socketio", action="store_true", help="Skip Socket.IO configuration.")
 	parser.add_argument("--skip-schedule", action="store_true", help="Skip schedule configuration.")
 	parser.add_argument("--with-coverage", action="store_true", help="Enable coverage.")