added --noninteractive to clamnewproject #70

proycon · Nov 2, 2018 · dbd08e0 · dbd08e0
1 parent 8302c36
commit dbd08e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/clam/clamnewproject.py b/clam/clamnewproject.py
@@ -42,14 +42,15 @@ def main():
     parser.add_argument('-u','--forceurl', type=str,help="The full URL to access the webservice", action='store',required=False)
     parser.add_argument('-U','--uwsgiport', type=int,help="UWSGI port to use for this webservice when deployed in production environments", action='store',default=8888,required=False)
     parser.add_argument('-f','--force',help="Force use of a directory which already exists", action='store_true',required=False)
+    parser.add_argument('--noninteractive',help="Non-interactive mode, don't ask questions", action='store_true',required=False)
     parser.add_argument('-v','--version',help="Version", action='version',version="CLAM version " + str(VERSION))
     parser.add_argument('sysid',type=str, help='System ID')
     args = parser.parse_args()
 
     createvenv = False
     if 'CONDA_PREFIX' in os.environ:
         print("NOTICE: Anaconda detected")
-    elif 'VIRTUAL_ENV' not in os.environ:
+    elif 'VIRTUAL_ENV' not in os.environ and not args.noninteractive:
         print("WARNING: You are not inside a Python Virtual Environment, using one is strongly recommended")
         yn = None
         while yn.strip().lower() not in ('y','yes','n','no'):

diff --git a/clam/tests/test.sh b/clam/tests/test.sh
@@ -24,7 +24,7 @@ if [ $? -ne 0 ]; then
 fi
 
 cd /tmp
-clamnewproject -f clamnewprojecttest
+clamnewproject -f clamnewprojecttest --noninteractive
 if [ $? -ne 0 ]; then
    echo "ERROR: clamnewproject didn't run well" >&2
    GOOD=0