664941557f4e443e43e09d8f047b7bcbfb61a576 max Mon Nov 20 16:02:36 2017 -0800 CIRM: fix websync program to deal properly with symlinks diff --git src/utils/webSync src/utils/webSync index 5a8c7df..0015cd2 100755 --- src/utils/webSync +++ src/utils/webSync @@ -211,31 +211,31 @@ filesThereName = join(logDir, "files.there.txt") filesHereName = join(logDir, "files.here.txt") if isfile(filesThereName) and not options.skipScan: os.remove(filesThereName) if isfile(filesHereName) and not options.skipScan: os.remove(filesHereName) if not isfile(filesThereName): fileUrl = join(url, "files.txt") logging.debug("Downloading %s" % fileUrl) cmd = "wget -q %s --no-check-certificate -O %s" % (fileUrl, filesThereName) run(cmd) if not isfile(filesHereName): - cmd = "du -ab > %s" % filesHereName + cmd = "find -L . -type f -exec du -Lab {} + > %s" % filesHereName run(cmd) hereFiles, hereDirs = parseFileList(filesHereName) thereFiles, thereDirs = parseFileList(filesThereName) logging.debug("checking %d directories, e.g. %s" % (len(thereDirs), list(thereDirs)[:3])) for d in thereDirs: if not isdir(d): os.makedirs(d) biggerHereFname = join(logDir, "biggerHere.txt") missingThereFname = join(logDir, "missingThere.txt") ariaCmdFname = join(logDir, "aria2c.in.tmp")