Signed-off-by: Peter Palfrader <[email protected]>
---
mirror/farm-journal-fetch-tarball | 2 +-
mirror/import-new-dumps | 2 +-
mirror/process-farm-update | 2 +-
misc/dump-tools/README | 2 +-
misc/dump-tools/add-new-dumps-to-git | 6 +++---
misc/dump-tools/import-new-dumps-from-git | 4 ++--
snapshot | 8 ++++----
web/app/docs/index.txt | 2 +-
web/app/snapshot/templates/misc-oldnews.mako | 2 +-
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/mirror/farm-journal-fetch-tarball
b/mirror/farm-journal-fetch-tarball
index 137cd75..218e922 100755
--- a/mirror/farm-journal-fetch-tarball
+++ b/mirror/farm-journal-fetch-tarball
@@ -114,7 +114,7 @@ try:
h = hash_file(fn)
if fn != h:
- sys.stderr.write("Warning: File %s has unexected hash value %s.
Ignoring\n"%(fn, h))
+ sys.stderr.write("Warning: File %s has unexpected hash value %s.
Ignoring\n"%(fn, h))
os.unlink(fn)
continue
diff --git a/mirror/import-new-dumps b/mirror/import-new-dumps
index c5e37f5..18e0fa8 100755
--- a/mirror/import-new-dumps
+++ b/mirror/import-new-dumps
@@ -62,7 +62,7 @@ db = DBHelper(config['db']['connectstring'])
os.chdir(config['dump']['incoming-dumppath'])
if not os.path.exists(options.snapshot) or not os.access(options.snapshot,
os.X_OK):
- sys.stderr.write("%s does not exist or is not
exectuable\n"%(options.snapshot))
+ sys.stderr.write("%s does not exist or is not
executable\n"%(options.snapshot))
sys.exit(1)
pending_import = []
diff --git a/mirror/process-farm-update b/mirror/process-farm-update
index c2c1873..0ae1e41 100755
--- a/mirror/process-farm-update
+++ b/mirror/process-farm-update
@@ -101,7 +101,7 @@ for fn in os.listdir('.'):
h = hash_file(fn)
if fn != h:
- sys.stderr.write("Warning: File %s has unexected hash value %s.
Ignoring\n"%(fn, h))
+ sys.stderr.write("Warning: File %s has unexpected hash value %s.
Ignoring\n"%(fn, h))
os.unlink(fn)
continue
diff --git a/misc/dump-tools/README b/misc/dump-tools/README
index 4b0ecc0..cc13219 100644
--- a/misc/dump-tools/README
+++ b/misc/dump-tools/README
@@ -3,4 +3,4 @@ However, there is an awful lot of redundancy, since the
difference between
two mirrorruns of the same archive is very tiny.
These tools help storing dumps in a git tree, which is pretty good at
-handling data with small differences accross many versions.
+handling data with small differences across many versions.
diff --git a/misc/dump-tools/add-new-dumps-to-git
b/misc/dump-tools/add-new-dumps-to-git
index ff3e10e..f758355 100755
--- a/misc/dump-tools/add-new-dumps-to-git
+++ b/misc/dump-tools/add-new-dumps-to-git
@@ -101,13 +101,13 @@ config = yaml.safe_load(open(options.conffile).read())
db = DBHelper(config['db']['connectstring'])
if not os.path.exists(options.snapshot) or not os.access(options.snapshot,
os.X_OK):
- sys.stderr.write("%s does not exist or is not
exectuable\n"%(options.snapshot))
+ sys.stderr.write("%s does not exist or is not
executable\n"%(options.snapshot))
sys.exit(1)
if not os.path.exists(options.extracter) or not os.access(options.extracter,
os.X_OK):
- sys.stderr.write("%s does not exist or is not
exectuable\n"%(options.extracter))
+ sys.stderr.write("%s does not exist or is not
executable\n"%(options.extracter))
sys.exit(1)
if not os.path.exists(options.adder) or not os.access(options.adder, os.X_OK):
- sys.stderr.write("%s does not exist or is not
exectuable\n"%(options.adder))
+ sys.stderr.write("%s does not exist or is not
executable\n"%(options.adder))
sys.exit(1)
options.extracter = os.path.abspath(options.extracter)
diff --git a/misc/dump-tools/import-new-dumps-from-git
b/misc/dump-tools/import-new-dumps-from-git
index 3ea9c6f..d1a93f7 100755
--- a/misc/dump-tools/import-new-dumps-from-git
+++ b/misc/dump-tools/import-new-dumps-from-git
@@ -62,10 +62,10 @@ config = yaml.safe_load(open(options.conffile).read())
db = DBHelper(config['db']['connectstring'])
if not os.path.exists(options.snapshot) or not os.access(options.snapshot,
os.X_OK):
- sys.stderr.write("%s does not exist or is not
exectuable\n"%(options.snapshot))
+ sys.stderr.write("%s does not exist or is not
executable\n"%(options.snapshot))
sys.exit(1)
if not os.path.exists(options.extracter) or not os.access(options.extracter,
os.X_OK):
- sys.stderr.write("%s does not exist or is not
exectuable\n"%(options.extracter))
+ sys.stderr.write("%s does not exist or is not
executable\n"%(options.extracter))
sys.exit(1)
options.extracter = os.path.abspath(options.extracter)
diff --git a/snapshot b/snapshot
index ac1a974..9803880 100755
--- a/snapshot
+++ b/snapshot
@@ -96,7 +96,7 @@ class FileBackend < StorageBackend
File.link(tmptarget, target)
add_to_journal(digest)
rescue Errno::EEXIST
- # it may have jumped into existance, that's no
problem.
+ # it may have jumped into existence, that's no
problem.
end
File.unlink(tmptarget)
end
@@ -791,7 +791,7 @@ class PackageIndexer
cache = @binarypkgs
throw "need a srcpkg_id" if srcpkg_id.nil?
else
- throw "Invalud type #{type}"
+ throw "Invalid type #{type}"
end
return cache[pkg][ver] if cache[pkg] and cache[pkg][ver]
@@ -859,7 +859,7 @@ class PackageIndexer
when "bin"
throw "need an arch" if arch.nil?
else
- throw "Invalud type #{type}"
+ throw "Invalid type #{type}"
end
digest = get_file_digest(path)
@@ -1316,7 +1316,7 @@ class SnapshotDumpAll
begin
File.link(tmptarget, target)
rescue Errno::EEXIST
- # it may have jumped into existance,
that's no problem.
+ # it may have jumped into existence,
that's no problem.
end
ensure
File.unlink(tmptarget)
diff --git a/web/app/docs/index.txt b/web/app/docs/index.txt
index 710b323..4d180dd 100644
--- a/web/app/docs/index.txt
+++ b/web/app/docs/index.txt
@@ -10,7 +10,7 @@ You can generate your documentation in HTML format by running
this command::
For this to work you will need to download and install `buildutils`_,
`pudge`_, and `pygments`_. The ``pudge`` command is disabled by
-default; to ativate it in your project, run::
+default; to activate it in your project, run::
setup.py addcommand -p buildutils.pudge_command
diff --git a/web/app/snapshot/templates/misc-oldnews.mako
b/web/app/snapshot/templates/misc-oldnews.mako
index 91b3d01..452990c 100644
--- a/web/app/snapshot/templates/misc-oldnews.mako
+++ b/web/app/snapshot/templates/misc-oldnews.mako
@@ -70,7 +70,7 @@ service.
<h2>2010-02-24</h2>
<p>
-So we finally finally got a second machine up and serving a copy of snapshot.
+So we finally got a second machine up and serving a copy of snapshot.
Of course this means that now a disk controller breaks in the snapshot-master
machine and thus half of our disks are rendered inaccessible. Even raid6
doesn't like that very much.
--
2.1.4
