Author: tlinnet Date: Fri Sep 5 11:09:47 2014 New Revision: 25663 URL: http://svn.gna.org/viewcvs/relax?rev=25663&view=rev Log: Fix for comments to dependency check of showApod. Modified: trunk/dep_check.py Modified: trunk/dep_check.py URL: http://svn.gna.org/viewcvs/relax/trunk/dep_check.py?rev=25663&r1=25662&r2=25663&view=diff ============================================================================== --- trunk/dep_check.py (original) +++ trunk/dep_check.py Fri Sep 5 11:09:47 2014 @@ -256,22 +256,30 @@ if subprocess_module: try: # Call function. - Temp=subprocess.Popen('showApod', stdout=subprocess.PIPE) + Temp = subprocess.Popen('showApod', stdout=subprocess.PIPE) + # Communicate with program, and get output and error output. (output, errput) = Temp.communicate() + # Wait for finish and get return code. return_value = Temp.wait() # Split the output into lines. line_split = output.splitlines() + + # Now make test. if line_split[0] == 'showApod: Show Effect of Processing on Noise and Linewidth.': - showApod_module = True + showApod_software = True else: - showApod_module = False + showApod_software = False + + # If software not available. except OSError: - showApod_module = False + showApod_software = False + +# If subprocess module not available, then do not allow showApod. else: - showApod_module = False + showApod_software = False # ctypes module. try: