diff options
author | Thomas Waldmann <tw@waldmann-edv.de> | 2015-02-27 19:38:01 +0100 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2015-03-22 14:20:47 +0200 |
commit | c8fa097da39ea2a8635f64c819c2129695edbf0c (patch) | |
tree | c27546b1638a0c8abb901657d6ee869c4f8d8399 | |
parent | 72c194459d3e66b4104e268fcb402abd35678ca6 (diff) | |
download | obnam-c8fa097da39ea2a8635f64c819c2129695edbf0c.tar.gz |
fix typos
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | obnamlib/app.py | 2 | ||||
-rw-r--r-- | obnamlib/fmt_6/repo_fmt_6.py | 4 | ||||
-rw-r--r-- | obnamlib/plugins/fuse_plugin.py | 2 | ||||
-rw-r--r-- | obnamlib/repo_interface.py | 18 | ||||
-rw-r--r-- | obnamlib/vfs.py | 4 | ||||
-rw-r--r-- | obnamlib/vfs_local.py | 4 |
7 files changed, 18 insertions, 18 deletions
@@ -450,7 +450,7 @@ Bug fixes: by ROGERIO DE CARVALHO BASTOS and patched by Peter Valdemar Mørch. * Setuid and setgid bits are now restored correctly, when restore happens as root. Reported by Pavel Kokolemin. -* Obnam now complains if no backup roots have been specfied. +* Obnam now complains if no backup roots have been specified. Version 1.2, released 2012-10-06 -------------------------------- diff --git a/obnamlib/app.py b/obnamlib/app.py index 45b444d9..476259ae 100644 --- a/obnamlib/app.py +++ b/obnamlib/app.py @@ -83,7 +83,7 @@ class App(cliapp.Application): metavar='TIMEOUT', default=60) - # Repositofy format selection. + # Repository format selection. self.settings.choice( ['repository-format'], diff --git a/obnamlib/fmt_6/repo_fmt_6.py b/obnamlib/fmt_6/repo_fmt_6.py index 9c08716d..9f94ad4e 100644 --- a/obnamlib/fmt_6/repo_fmt_6.py +++ b/obnamlib/fmt_6/repo_fmt_6.py @@ -554,7 +554,7 @@ class RepositoryFormat6(obnamlib.RepositoryInterface): def set_generation_key( self, generation_id, key, value): # pragma: no cover - # FIXME: This no worky for generations other than the currently + # FIXME: This is not working for generations other than the currently # started one. There should at least be an assert about it. client_name, gen_number = self._unpack_gen_id(generation_id) @@ -881,7 +881,7 @@ class RepositoryFormat6(obnamlib.RepositoryInterface): try: expected_checksum = self._chunklist.get_checksum(chunk_id) except KeyError: # pragma: no cover - # Chunk is not in the checksum tree, so we cannot valide + # Chunk is not in the checksum tree, so we cannot validate # its checksum. We'll just assume it's OK. return True return actual_checksum == expected_checksum diff --git a/obnamlib/plugins/fuse_plugin.py b/obnamlib/plugins/fuse_plugin.py index 9f152e15..f438feb7 100644 --- a/obnamlib/plugins/fuse_plugin.py +++ b/obnamlib/plugins/fuse_plugin.py @@ -554,7 +554,7 @@ class MountPlugin(obnamlib.ObnamPlugin): '''Mount backup repository as a user-space filesystem. - At the momemnt only a specific generation can be mounted + At the moment only a specific generation can be mounted ''' diff --git a/obnamlib/repo_interface.py b/obnamlib/repo_interface.py index 2720626e..b39f8abe 100644 --- a/obnamlib/repo_interface.py +++ b/obnamlib/repo_interface.py @@ -28,7 +28,7 @@ import obnamlib # The following is a canonical list of all keys that can be used with # the repository interface for key/value pairs. Not all formats need # to support all keys, but they all must support the test keys, for -# the test suite to function. All commong file metadata keys must also +# the test suite to function. All common file metadata keys must also # be supported by all formats. # # The keys may change in value from run to run. Treat them as opaque, @@ -239,7 +239,7 @@ class RepositoryInterface(object): implementation with the ``set_fs`` method. It must be stressed that ALL access to the repository go via - an implemention of RepositoryInterface. Further, all the + an implementation of RepositoryInterface. Further, all the implementation classes must be instantiated via RepositoryFactory. The abstraction RepositoryInterface provides for repositories @@ -479,7 +479,7 @@ class RepositoryInterface(object): raise NotImplementedError() def get_client_generation_ids(self, client_name): - '''Return a list of opague ids for generations in a client. + '''Return a list of opaque ids for generations in a client. The list is ordered: the first id in the list is the oldest generation. The ids needs not be sortable, and they may or @@ -1205,7 +1205,7 @@ class RepositoryInterfaceTests(unittest.TestCase): # pragma: no cover 'fooclient', obnamlib.REPO_CLIENT_TEST_KEY) self.assertEqual(value, 'bar') - def test_setting_unallowed_client_key_fails(self): + def test_setting_disallowed_client_key_fails(self): self.setup_client() self.repo.lock_client('fooclient') self.assertRaises( @@ -1220,7 +1220,7 @@ class RepositoryInterfaceTests(unittest.TestCase): # pragma: no cover self.repo.set_client_key, 'fooclient', obnamlib.REPO_CLIENT_TEST_KEY, 'bar') - def test_committing_client_preserves_key_changs(self): + def test_committing_client_preserves_key_changes(self): if self.client_test_key_is_allowed(): self.setup_client() self.repo.lock_client('fooclient') @@ -1334,7 +1334,7 @@ class RepositoryInterfaceTests(unittest.TestCase): # pragma: no cover gen_id, obnamlib.REPO_GENERATION_TEST_KEY) self.assertEqual(value, 'bar') - def test_setting_unallowed_generation_key_fails(self): + def test_setting_disallowed_generation_key_fails(self): if self.generation_test_key_is_allowed(): gen_id = self.create_generation() self.assertRaises( @@ -1350,7 +1350,7 @@ class RepositoryInterfaceTests(unittest.TestCase): # pragma: no cover self.repo.set_generation_key, gen_id, obnamlib.REPO_GENERATION_TEST_KEY, 'bar') - def test_committing_client_preserves_generation_key_changs(self): + def test_committing_client_preserves_generation_key_changes(self): if self.generation_test_key_is_allowed(): gen_id = self.create_generation() self.repo.set_generation_key( @@ -1586,7 +1586,7 @@ class RepositoryInterfaceTests(unittest.TestCase): # pragma: no cover gen_id, '/foo/bar', obnamlib.REPO_FILE_TEST_KEY) self.assertEqual(value, 'yoyo') - def test_setting_unallowed_file_key_fails(self): + def test_setting_disallowed_file_key_fails(self): gen_id = self.create_generation() self.repo.add_file(gen_id, '/foo/bar') self.assertRaises( @@ -1872,7 +1872,7 @@ class RepositoryInterfaceTests(unittest.TestCase): # pragma: no cover set(self.repo.get_chunk_ids()), set([chunk_id_1, chunk_id_2])) - def test_have_not_got_chunk_indexes_lock_initally(self): + def test_have_not_got_chunk_indexes_lock_initially(self): self.setup_client() self.assertFalse(self.repo.got_chunk_indexes_lock()) diff --git a/obnamlib/vfs.py b/obnamlib/vfs.py index cdd0ae6b..7bf75f6c 100644 --- a/obnamlib/vfs.py +++ b/obnamlib/vfs.py @@ -358,7 +358,7 @@ class VfsTests(object): # pragma: no cover * self.basepath to the path to the base of the filesystem basepath must be operable as a pathname using os.path tools. If - the VFS implemenation operates remotely and wants to operate on a + the VFS implementation operates remotely and wants to operate on a URL like 'http://domain/path' as the baseurl, then basepath must be just the path portion of the URL. @@ -607,7 +607,7 @@ class VfsTests(object): # pragma: no cover self.assertEqual(self.fs.lstat('foo').st_atime_sec, 1) # not all filesystems support sub-second timestamps; those that # do not, return 0, so we have to accept either that or the correct - # value, but no other vlaues + # value, but no other values self.assert_(self.fs.lstat('foo').st_atime_nsec in [0, 2*1000]) self.assertEqual(self.fs.lstat('foo').st_mtime_sec, 3) diff --git a/obnamlib/vfs_local.py b/obnamlib/vfs_local.py index 8462df22..c9b105e3 100644 --- a/obnamlib/vfs_local.py +++ b/obnamlib/vfs_local.py @@ -278,7 +278,7 @@ class LocalFS(obnamlib.VirtualFileSystem): return os.path.isdir(self.join(pathname)) def mknod(self, pathname, mode): - tracing.trace('pathmame=%s', pathname) + tracing.trace('pathname=%s', pathname) tracing.trace('mode=%o', mode) os.mknod(self.join(pathname), mode) @@ -406,7 +406,7 @@ class LocalFS(obnamlib.VirtualFileSystem): ino = st.st_ino result.append((ino, name, st)) - # We sort things in inode order, for speed when doing namei lookups + # We sort things in inode order, for speed when doing name lookups # when backing up. result.sort() return [(name, st) for ino, name, st in result] |