[Pkg-owncloud-commits] [python-owncloud] 25/96: Some more spelling fixes.
Sandro Knauß
hefee-guest at moszumanska.debian.org
Fri Nov 22 01:28:24 UTC 2013
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository python-owncloud.
commit ba1ac7b3b7d6371be27a0372ee7511d6364cab5c
Author: Norman Rieß <norman at smash-net.org>
Date: Tue Mar 12 10:16:11 2013 +0100
Some more spelling fixes.
---
README.md | 68 +++++++++++++++++++++++++++++------------------------------
csync.py | 52 ++++++++++++++++++++++-----------------------
csynclib.py | 2 +-
version.dat | 2 +-
version.py | 2 +-
5 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/README.md b/README.md
index e667648..a155a4e 100644
--- a/README.md
+++ b/README.md
@@ -11,45 +11,45 @@ Requirements:
if you don't want to install mirall, you can install the 'ocsync' binary package from the owncloud repo's.
So far we have only successfully tested against 0.70.4 of the libocsync library.
* Python > 2.6 < 3 (patches welcome)
-* an ownCloud server to sync with. (presumably you already have one of these)
+* an ownCloud server to sync with. (Presumably you already have one of these.)
-usage: just run csync.py -h, and it will give you help.
-
usage: csync.py [-h] [-v] [-c [CONFIG]] [-u [USER]] [--ssl [SSLFINGERPRINT]]
- [-p [PASS]] [--dry-run] [-s [SRC]] [-d [DST]] [--url [URL]]
+ [-p [PASS]] [--dry-run] [--debug] [-s [SRC]] [-d [DST]]
+ [--url [URL]]
- Synchronize files across machines using ownCloud DAV server
+ Synchronize files across machines using ownCloud DAV server.
optional arguments:
- -h, --help show this help message and exit
- -v, --version
- -c [CONFIG], --config [CONFIG]
- configuration to use.
- -u [USER], --user [USER]
- username on server.
- --ssl [SSLFINGERPRINT]
- SSL fingerprint on server to accept.
- -p [PASS], --pass [PASS]
- password on server. you can also store this in
- environment variable OCPASS
- --dry-run Dry Run, do not actually execute command.
- -s [SRC], --src [SRC]
- local Directory to sync with
- -d [DST], --dst [DST]
- folder on server.
- --url [URL] url to sync to.
+ -h, --help show this help message and exit
+ -v, --version show program's version number and exit
+ -c [CONFIG], --config [CONFIG]
+ Configuration to use.
+ -u [USER], --user [USER]
+ Username on server.
+ --ssl [SSLFINGERPRINT]
+ SSL fingerprint on server to accept.
+ -p [PASS], --pass [PASS]
+ Password on server. You can also store this in
+ environment variable OCPASS.
+ --dry-run Dry Run, do not actually execute command.
+ --debug Print a bunch of debug info.
+ -s [SRC], --src [SRC]
+ Local Directory to sync with.
+ -d [DST], --dst [DST]
+ Folder on server.
+ --url [URL] URL to sync to.
I support the ownCloud config file, which is located here:
- $HOME/.local/share/data/ownCloud/owncloud.cfg
+ $HOME/.local/share/data/ownCloud/owncloud.cfg
I only support the 'ownCloud' section of the config.
I support the following keys in the cfg file:
- user: The username on the ownCloud server
- url: the url of the ownCloud Server
- pass: the password on the ownCloud server
- sslFingerprint: a valid SSL fingerprint for the server.
- src: local directory to sync against.
- dst: folder on the server to sync against.
+ user: The username on the ownCloud server
+ url: the url of the ownCloud Server
+ pass: the password on the ownCloud server
+ sslFingerprint: a valid SSL fingerprint for the server.
+ src: local directory to sync against.
+ dst: folder on the server to sync against.
complete example:
[ownCloud]
user=awesomeSauce
@@ -60,8 +60,8 @@ usage: just run csync.py -h, and it will give you help.
dst=clientsync
Password options:
- *) You can specify on the cmd line: -p (not very safe)
- *) in the envifonment variable: OCPASS
- *) in the owncloud.cfg file as pass = <password>
- the choice is yours, if you put it in the cfg file, be careful to
- make sure nobody but you can read the file. (0400/0600 file perms)
+ *) You can specify on the cmd line: -p (not very safe)
+ *) In the envifonment variable: OCPASS
+ *) In the owncloud.cfg file as pass = <password>
+ The choice is yours, if you put it in the cfg file, be careful to
+ make sure nobody but you can read the file. (0400/0600 file perms).
diff --git a/csync.py b/csync.py
index 482827d..3caedbf 100755
--- a/csync.py
+++ b/csync.py
@@ -79,12 +79,12 @@ class ownCloudSync():
if DEBUG:
print 'libocsync version: ', libVersion
if libVersion != '0.70.4':
- print 'this version of libocsync %s is not tested against ownCloud server 4.7.5' % libVersion
+ print 'This version of libocsync %s is not tested against ownCloud server 4.7.5.' % libVersion
c = csynclib.CSYNC()
self.ctx = ctypes.pointer(c)
self.buildURL()
#pprint.pprint(self.cfg)
- print 'syncing %s to %s logging in as user: %s' % (self.cfg['src'],
+ print 'Syncing %s to %s logging in as user: %s' % (self.cfg['src'],
self.cfg['url'],
USERNAME,
)
@@ -96,7 +96,7 @@ class ownCloudSync():
"""build the URL we use for owncloud"""
url = self.cfg['url']
if url == '':
- print 'you must specify a url, use --url, or put in cfg file'
+ print 'You must specify a url, use --url, or put in cfg file.'
sys.exit(1j)
url = url.replace('https','ownclouds')
url = url.replace('http','owncloud')
@@ -132,23 +132,23 @@ class ownCloudSync():
if r != 0:
error(self.ctx, 'csync_init', r)
if DEBUG:
- print 'initialization done'
+ print 'Initialization done.'
#csynclib.csync_set_log_verbosity(self.ctx, ctypes.c_int(11))
r = csynclib.csync_update(self.ctx)
if r != 0:
error(self.ctx, 'csync_update', r)
if DEBUG:
- print 'update done'
+ print 'Update done.'
r = csynclib.csync_reconcile(self.ctx)
if r != 0:
error(self.ctx, 'csync_reconcile', r)
if DEBUG:
- print 'reconcile done'
+ print 'Reconcile done.'
r = csynclib.csync_propagate(self.ctx)
if r != 0:
error(self.ctx, 'csync_propogate', r)
if DEBUG:
- print 'propogate finished, destroying'
+ print 'Propogate finished, destroying.'
r = csynclib.csync_destroy(self.ctx)
if r != 0:
error(self.ctx, 'csync_destroy', r)
@@ -165,9 +165,9 @@ def error(ctx, cmd, returnCode):
errMsg = csynclib.csync_get_error_string(ctx)
if not errMsg:
if errNum == 20 and cmd == 'csync_update':
- errMsg = 'This is an authentication problem with the server, check user/pass'
+ errMsg = 'This is an authentication problem with the server, check user/pass.'
if errNum == 26 and cmd == 'csync_update':
- errMsg = 'This is a remote folder destination issue, check that the remote folder exists on ownCloud'
+ errMsg = 'This is a remote folder destination issue, check that the remote folder exists on ownCloud.'
print 'ERROR: %s exited %s, error %s: %s' % (
cmd,
returnCode,
@@ -190,7 +190,7 @@ def getConfigPath():
cfgPath = os.path.join('%LOCALAPPDATA%','ownCloud')
cfgPath = os.path.expandvars(cfgPath)
else:
- print 'unkown/not supported platform:', sys.platform
+ print 'Unkown/not supported platform:', sys.platform
sys.exit(1)
if DEBUG:
print 'getConfigPath:', cfgPath
@@ -198,7 +198,7 @@ def getConfigPath():
def getConfig(args):
if DEBUG:
- print 'from args: '
+ print 'From args: '
pargs = copy.copy(args)
if pargs['pass']:
pargs['pass'] = PASSWORD_SAFE
@@ -241,7 +241,7 @@ def getConfig(args):
#cmd line arguments win out over config files.
cfg.update(args)
if DEBUG:
- print 'finished config file:'
+ print 'Finished config file:'
pcfg = copy.copy(cfg)
if pcfg['pass']:
pcfg['pass'] = PASSWORD_SAFE
@@ -252,20 +252,20 @@ def main(args):
if args['debug']:
global DEBUG
DEBUG = True
- print 'turning debug on'
+ print 'Turning debug on'
cfg = getConfig(args)
try:
sync = ownCloudSync(cfg)
except KeyError:
exc_type, exc_value, exc_tb = sys.exc_info()
- print 'sorry this option: %s is required, was not found in cfg file or on cmd line' % (exc_value)
+ print 'Sorry this option: %s is required, was not found in cfg file or on cmd line.' % (exc_value)
if DEBUG:
raise
if __name__ == '__main__':
parser = argparse.ArgumentParser(
formatter_class=argparse.RawDescriptionHelpFormatter,
- description = 'Synchronize files across machines using ownCloud DAV server',
+ description = 'Synchronize files across machines using ownCloud DAV server.',
epilog = """
I support the ownCloud config file, which is located here:
{cfg}
@@ -288,10 +288,10 @@ dst=clientsync
Password options:
*) You can specify on the cmd line: -p (not very safe)
- *) in the envifonment variable: OCPASS
- *) in the owncloud.cfg file as pass = <password>
- the choice is yours, if you put it in the cfg file, be careful to
- make sure nobody but you can read the file. (0400/0600 file perms)
+ *) In the envifonment variable: OCPASS
+ *) In the owncloud.cfg file as pass = <password>
+ The choice is yours, if you put it in the cfg file, be careful to
+ make sure nobody but you can read the file. (0400/0600 file perms).
""".format(cfg = os.path.join(getConfigPath(),'owncloud.cfg')),
)
v = "%s - repo: %s" % (VERSION.asString, VERSION.asHead)
@@ -299,24 +299,24 @@ Password options:
action='version',
version = '%(prog)s ' + v)
parser.add_argument('-c', '--config', nargs='?', default = None,
- help = "configuration to use.")
+ help = "Configuration to use.")
parser.add_argument('-u', '--user', nargs='?', default = None,
- help = "username on server.")
+ help = "Username on server.")
parser.add_argument('--ssl', nargs='?', default = None,
dest = 'sslFingerprint',
help = "SSL fingerprint on server to accept.")
parser.add_argument('-p', '--pass', nargs='?',
- help = "password on server. you can also store this in environment variable OCPASS")
+ help = "Password on server. You can also store this in environment variable OCPASS.")
parser.add_argument('--dry-run', action = 'store_true', default = False,
help = "Dry Run, do not actually execute command.")
parser.add_argument('--debug', action = 'store_true', default = False,
- help = "print a bunch of debug info.")
+ help = "Print a bunch of debug info.")
parser.add_argument('-s', '--src', nargs='?',
default = os.path.expanduser(os.path.join('~','ownCloud')),
- help = "local Directory to sync with")
+ help = "Local Directory to sync with.")
parser.add_argument('-d', '--dst', nargs='?', default = 'clientsync',
- help = "folder on server.")
+ help = "Folder on server.")
parser.add_argument('--url', nargs='?', default = None,
- help = "url to sync to.")
+ help = "URL to sync to.")
args = vars(parser.parse_args())
main(args)
diff --git a/csynclib.py b/csynclib.py
index 37832c0..627b505 100644
--- a/csynclib.py
+++ b/csynclib.py
@@ -12,7 +12,7 @@ elif os.path.exists('/usr/lib64/libocsync.so.0'):
else:
path = ctypes.util.find_library('libocsync')
if path:
- print 'found libocsync @', path
+ print 'Found libocsync @', path
_libraries['/usr/lib/libocsync.so.0'] = CDLL(path)
else:
print 'ERROR, can not find shared library libocsync'
diff --git a/version.dat b/version.dat
index 27da874..abab05d 100644
--- a/version.dat
+++ b/version.dat
@@ -1 +1 @@
-{"head": "827646eec775e78098baf261fcc6392207ac47b8", "float": 0.1, "string": "0.1"}
\ No newline at end of file
+{"head": "c6a788bbbd56e6bf1bdc8e8bd73b2bcb38d3bfaa", "float": 0.1, "string": "0.1"}
\ No newline at end of file
diff --git a/version.py b/version.py
index ec924b3..1cc0d82 100644
--- a/version.py
+++ b/version.py
@@ -111,7 +111,7 @@ version = gitVersion()
if __name__ == '__main__':
- print 'testing version'
+ print 'Testing version.'
v = hgVersion()
print 'dict:', v.version
print 'string:', v.asString
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/python-owncloud.git
More information about the Pkg-owncloud-commits
mailing list