1Upstream-Status: Inappropriate [No upstream maintenance]
2
3Signed-off-by: Anne Mulhern <mulhern@yoctoproject.org>
4
5---
6
7Index: Bastille/bin/bastille
8===================================================================
9--- Bastille.orig/bin/bastille	2013-08-21 08:59:06.647950000 -0400
10+++ Bastille/bin/bastille	2013-08-21 15:55:53.193631711 -0400
11@@ -195,7 +195,6 @@
12 systemFileLocations
13
14 isAssessing='no'
15-nonXArg='no'
16
17 if [ $PERL_V_MAJ -eq $MIN_V_MAJ  -a  $PERL_V_MIN -lt $MIN_V_MIN -o $PERL_V_MAJ -lt  $MIN_V_MAJ ]; then # invalid Perl
18     printErr
19@@ -316,12 +315,10 @@
20 	  '--os')
21 	      options_left="$options_left --os"
22               optarg='yes'
23-              nonXArg='yes'
24 	      ;;
25           '-f')
26               options_left="$options_left -f"
27               optarg='yes'
28-              nonXArg='yes'
29               ;;
30 #  Non-exclusive (undocumented and unsupported) options follow:
31 #  There is no validity/combination checking done with these.
32@@ -345,11 +342,6 @@
33       fi
34     done
35
36-#Detect case where -f or --os attempted use with --assess
37-    if [ \( x$nonXArg = xyes \) -a  \( x$isAssessing = xyes \) ]; then
38-      printUsage
39-      exit 2
40-    fi
41
42 # We have a valid version of perl! Verify that all the required
43 # modules can be found.
44