summaryrefslogtreecommitdiffstats
path: root/bin/repoman
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>2010-10-23 18:51:34 +0200
committerArfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>2010-10-23 18:51:34 +0200
commit8879a8e85ee2cf69152aa56079ccac8a3a78a5ac (patch)
tree30cb893db2ab04aefaa77ba35c4009c0ee08ec0e /bin/repoman
parente9ef0bcf6231efa4d04342bf4e75086d2d7f79b9 (diff)
downloadportage-8879a8e85ee2cf69152aa56079ccac8a3a78a5ac.tar.gz
portage-8879a8e85ee2cf69152aa56079ccac8a3a78a5ac.tar.bz2
portage-8879a8e85ee2cf69152aa56079ccac8a3a78a5ac.zip
Fix some typos and improve a message in repoman.
Diffstat (limited to 'bin/repoman')
-rwxr-xr-xbin/repoman11
1 files changed, 5 insertions, 6 deletions
diff --git a/bin/repoman b/bin/repoman
index d9b0d3464..7cd0fc472 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -618,7 +618,7 @@ repolevel = len(reposplit)
if options.mode == 'commit' and repolevel not in [1,2,3]:
print(red("***")+" Commit attempts *must* be from within a vcs co, category, or package directory.")
print(red("***")+" Attempting to commit from a packages files directory will be blocked for instance.")
- print(red("***")+" This is intended behaviour, to ensure the manifest is recommited for a package.")
+ print(red("***")+" This is intended behaviour, to ensure the manifest is recommitted for a package.")
print(red("***"))
err("Unable to identify level we're commiting from for %s" % '/'.join(reposplit))
@@ -2044,7 +2044,7 @@ else:
myvcstree=portage.cvstree.getentries("./",recursive=1)
myunadded=portage.cvstree.findunadded(myvcstree,recursive=1,basedir="./")
except SystemExit as e:
- raise # TODO propogate this
+ raise # TODO propagate this
except:
err("Error retrieving CVS tree; exiting.")
if vcs == "svn":
@@ -2052,7 +2052,7 @@ else:
svnstatus=os.popen("svn status --no-ignore").readlines()
myunadded = [ "./"+elem.rstrip().split()[1] for elem in svnstatus if elem.startswith("?") or elem.startswith("I") ]
except SystemExit as e:
- raise # TODO propogate this
+ raise # TODO propagate this
except:
err("Error retrieving SVN info; exiting.")
if vcs == "git":
@@ -2065,7 +2065,7 @@ else:
bzrstatus=os.popen("bzr status -S .").readlines()
myunadded = [ "./"+elem.rstrip().split()[1].split('/')[-1:][0] for elem in bzrstatus if elem.startswith("?") or elem[0:2] == " D" ]
except SystemExit as e:
- raise # TODO propogate this
+ raise # TODO propagate this
except:
err("Error retrieving bzr info; exiting.")
if vcs == "hg":
@@ -2256,8 +2256,7 @@ else:
myheaders.append(myfile)
print("%s have headers that will change." % green(str(len(myheaders))))
- print("* Files with headers will cause the " + \
- "manifests to be made and recommited.")
+ print("* Files with headers will cause the manifests to be changed and committed separately.")
logging.info("myupdates: %s", myupdates)
logging.info("myheaders: %s", myheaders)