Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/cygwin-apps/calm.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2017-04-06 14:47:31 +0300
committerJon Turney <jon.turney@dronecode.org.uk>2017-04-12 15:03:27 +0300
commit58a8b6d4b8759f2db8c2003694a1cf6db68fd45b (patch)
tree4afabf788ff3439a8a71229a9fae0f0864179155
parent5c05a598d8230e55417f94b6615900a704d231d2 (diff)
Try to use fewer long paths in file move logging
-rw-r--r--calm/uploads.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/calm/uploads.py b/calm/uploads.py
index d9a172d..db1a23b 100644
--- a/calm/uploads.py
+++ b/calm/uploads.py
@@ -252,10 +252,10 @@ def move(args, movelist, fromdir, todir):
os.makedirs(os.path.join(todir, p), exist_ok=True)
except FileExistsError:
pass
- logging.info("move from '%s' to '%s':" % (os.path.join(fromdir, p), os.path.join(todir, p)))
+ logging.debug("move from '%s' to '%s':" % (os.path.join(fromdir, p), os.path.join(todir, p)))
for f in sorted(movelist[p]):
if os.path.exists(os.path.join(fromdir, p, f)):
- logging.info("%s" % (f))
+ logging.info("%s" % os.path.join(p, f))
if not args.dryrun:
os.rename(os.path.join(fromdir, p, f), os.path.join(todir, p, f))
else:
@@ -263,6 +263,8 @@ def move(args, movelist, fromdir, todir):
def move_to_relarea(m, args, movelist):
+ if movelist:
+ logging.info("move from %s's upload area to release area:" % (m.name))
move(args, movelist, m.homedir(), args.rel_area)
# XXX: Note that there seems to be a separate process, not run from
# cygwin-admin's crontab, which changes the ownership of files in the
@@ -270,6 +272,8 @@ def move_to_relarea(m, args, movelist):
def move_to_vault(args, movelist):
+ if movelist:
+ logging.info("move from release area to vault:")
move(args, movelist, args.rel_area, args.vault)