X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=bin%2Fcheck_security_fixes.py;h=ec73c2264fb02cfe91093212824e415120b05e54;hb=fdf0eca063baf13cb3f30b1c276d65f9687d5527;hp=4d87c93bce4b74d1194fca2211755c7979d265a5;hpb=fc8410065bd558265a4f05bcc351b9b6cacd186a;p=platal.git diff --git a/bin/check_security_fixes.py b/bin/check_security_fixes.py index 4d87c93..ec73c22 100755 --- a/bin/check_security_fixes.py +++ b/bin/check_security_fixes.py @@ -1,6 +1,6 @@ #!/usr/bin/env python #*************************************************************************** -#* Copyright (C) 2003-2009 Polytechnique.org * +#* Copyright (C) 2003-2010 Polytechnique.org * #* http://opensource.polytechnique.org/ * #* * #* This program is free software; you can redistribute it and/or modify * @@ -25,10 +25,10 @@ patches. Important notice: do not execute this script directly from an automatic checkout of plat/al. It would be extremely unwise to execute it with root privileges from -a place where everybody can change it ! +a place where everybody can change it! Usage (-w updates the local .htaccess to disable guilty working copies): - check_security_fixes.py [-w] -b REFERENCE_PLATAL PLATAL_TO_CHECK ... + check_security_fixes.py [-w] -b REFERENCE_PLATAL PLATAL_TO_CHECK... """ import optparse @@ -80,7 +80,7 @@ class WorkingCopy(object): ref_file = os.path.join(self.reference_path, security_file) wc_file = os.path.join(self.checkout_path, security_file) - diff = os.popen('diff -NBwu0 %s %s' % (ref_file, wc_file)) + diff = os.popen('diff -NBw -U 0 %s %s' % (ref_file, wc_file)) for line in diff.readlines(): if self.SECURITY_FIX_RE.match(line): yield line[1:-1] @@ -143,7 +143,7 @@ def SelfCheckIsLatestVersion(base_path): most deployment will want to execute this script with root privileges, which implies that this script is deployed in a safe directory, and not just executed from an automatically updated checkout of plat/al (how - unsafe would that be ...).""" + unsafe would that be...).""" base_script = os.path.join(base_path, 'bin/check_security_fixes.py') local_script = os.path.abspath(sys.argv[0])