summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/repoman4
-rw-r--r--pym/portage/tests/repoman/test_simple.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/repoman b/bin/repoman
index 65ac634cd..f216a9bd1 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -642,8 +642,8 @@ if options.mode == 'commit' and repolevel not in [1,2,3]:
print(red("***"))
err("Unable to identify level we're commiting from for %s" % '/'.join(reposplit))
-# Make startdir relative to the cannonical repodir, so that we can pass
-# it to digestgen and it won't have to be cannonicalized again.
+# Make startdir relative to the canonical repodir, so that we can pass
+# it to digestgen and it won't have to be canonicalized again.
if repolevel == 1:
startdir = repodir
else:
diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py
index 7717f3678..ec27a0991 100644
--- a/pym/portage/tests/repoman/test_simple.py
+++ b/pym/portage/tests/repoman/test_simple.py
@@ -141,7 +141,7 @@ class SimpleRepomanTestCase(TestCase):
with open(os.path.join(portdir, cp, "metadata.xml"), 'w') as f:
f.write(playground.metadata_xml_template % xml_data)
# Use a symlink to portdir, in order to trigger bugs
- # involving cannonical vs. non-canonical paths.
+ # involving canonical vs. non-canonical paths.
portdir_symlink = os.path.join(eroot, "portdir_symlink")
os.symlink(portdir, portdir_symlink)
# repoman checks metadata.dtd for recent CTIME, so copy the file in