Commit 96c682d2 authored by Daniel Armbruster's avatar Daniel Armbruster Committed by thomas.forbriger
Browse files

further improvements implemented

This is a legacy commit from before 2015-05-18.
It may be incomplete as well as inconsistent.
See COPYING.legacy and README.history for details.


SVN Path:     http://gpitrsvn.gpi.uni-karlsruhe.de/repos/TFSoftware/trunk
SVN Revision: 5059
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c
parent dc415d2d
#!/usr/bin/env python
#!/usr/bin/env python2
# This is <csbackscp.py>
# ----------------------------------------------------------------------------
# $Id$
......@@ -35,7 +35,10 @@
# 24/02/2013 V0.1 Daniel Armbruster
# 06/03/2013 V0.2 provide option to select copy command
# 07/03/2013 V1.0 provide '-newer' option
# 14/03/2013 V1.0.1 catch timeout conversion exception
# 14/03/2013 V1.0.2 catch timeout conversion exception; avoid throwing an
# exception in case of no checksum was available for a
# data file; use rsync based on timestamp comparison
# (faster than based on checksum comparison [-c])
#
# ============================================================================
#
......@@ -52,7 +55,7 @@ import csbackErrorCodes as eCodes
import csbacklog
import pidlock
__version__ = "V1.0.1"
__version__ = "V1.0.2"
__subversion__ = "$Id$"
__license__ = "GPLv2+"
__author__ = "Daniel Armbruster"
......@@ -228,7 +231,7 @@ def main(argv=None):
# rsync process.
logger.getLogger().info( \
"Checking which data files would be copied by rsync ...")
rsyncCmd = ["rsync", "-anc", "--out-format=%n"]
rsyncCmd = ["rsync", "-an", "--out-format=%n"]
if newerOpt is not None:
logger.getLogger().info("Taking time dependence into consideration.")
......@@ -327,7 +330,11 @@ def main(argv=None):
"File '{0}' has no integrity anymore and won't be copied.". \
format(dataFilePath))
except csf.CsFileError as err:
raise Error(err.msg, err.errorCode)
if err.errorCode == eCodes.CSFILE_NoEntryAvail:
logger.getLogger().debug( \
"No checksum available for file '{0}'.".format(dataFilePath))
else:
raise Error(err.msg, err.errorCode)
else:
logger.getLogger().debug( \
"Missing checksum file in directory '{0}'".format( \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment