浏览代码

Add --force option to fig rm

Ben Firshman 11 年之前
父节点
当前提交
2ca0e7954a
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      fig/cli/main.py

+ 5 - 3
fig/cli/main.py

@@ -170,17 +170,19 @@ class TopLevelCommand(Command):
         """
         """
         Remove stopped service containers.
         Remove stopped service containers.
 
 
-        Usage: rm [SERVICE...]
+        Usage: rm [options] [SERVICE...]
 
 
         Options:
         Options:
-            -v    Remove volumes associated with containers
+            --force   Don't ask to confirm removal
+            -v        Remove volumes associated with containers
         """
         """
         all_containers = self.project.containers(service_names=options['SERVICE'], stopped=True)
         all_containers = self.project.containers(service_names=options['SERVICE'], stopped=True)
         stopped_containers = [c for c in all_containers if not c.is_running]
         stopped_containers = [c for c in all_containers if not c.is_running]
 
 
         if len(stopped_containers) > 0:
         if len(stopped_containers) > 0:
             print("Going to remove", list_containers(stopped_containers))
             print("Going to remove", list_containers(stopped_containers))
-            if yesno("Are you sure? [yN] ", default=False):
+            if options.get('--force') \
+                    or yesno("Are you sure? [yN] ", default=False):
                 self.project.remove_stopped(service_names=options['SERVICE'],
                 self.project.remove_stopped(service_names=options['SERVICE'],
                                             remove_volumes=options.get('-v', False))
                                             remove_volumes=options.get('-v', False))
         else:
         else: