diff --git a/checkin_notes b/checkin_notes index 29c991d306..ed9c3c532e 100755 --- a/checkin_notes +++ b/checkin_notes @@ -7151,6 +7151,8 @@ Karl 2003-10-27 disk filename 'open_name=url_filename' (url_filename is the basename of file as copied to download/) + tools/ + update_versions py/Boinc/ tools.py diff --git a/py/Boinc/tools.py b/py/Boinc/tools.py index 70cdebc869..5d588959d2 100644 --- a/py/Boinc/tools.py +++ b/py/Boinc/tools.py @@ -61,7 +61,7 @@ def process_executable_file(file, signature_text=None, quiet=False, executable=T target_path = os.path.join(target_dir, target_file_base) if file != target_path: if not quiet: - print "Copying %s to %s"%(file_base, target_dir) + print "Copying %s to %s"%(source_file_base, target_dir) shutil.copy(file, target_path) xml = ''' diff --git a/tools/update_versions b/tools/update_versions index 534b12b175..50ffad192a 100755 --- a/tools/update_versions +++ b/tools/update_versions @@ -40,6 +40,7 @@ verbose = 0 try: if sys.argv[1] == '-v': verbose = 1 + print '(verbose mode)' except: pass @@ -62,6 +63,9 @@ def xsort(list): newlist.sort() return newlist +def xlistdir(dir): + return map(lambda file: os.path.join(dir, file), os.listdir(dir)) + def add_files(app, match, exec_file, non_exec_files=[]): ''' add files to app/core. @@ -142,7 +146,7 @@ def find_versions(app, dir): """ - for filepath in os.listdir(dir): + for filepath in xlistdir(dir): if os.path.islink(filepath): continue if os.path.isdir(filepath): @@ -151,7 +155,7 @@ def find_versions(app, dir): match = None non_exec_files = [] dir = filepath - for filepath in os.listdir(dir): + for filepath in xlistdir(dir): if os.path.isdir(filepath): continue if not match: @@ -176,7 +180,7 @@ def find_versions(app, dir): continue add_files(app=app, match=match, exec_file=filepath) -for appdir in os.listdir(config.app_dir): +for appdir in xlistdir(config.app_dir): if not os.path.isdir(appdir): continue dirname = os.path.basename(appdir) if dirname == 'boinc':