| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-30 19:20:46 +0000 (Sun, 30 Mar 2008) |
| 3 |
New Revision: 9632 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/RELEASE-NOTES |
| 7 |
main/trunk/bin/md5check.py |
| 8 |
main/trunk/bin/repoman |
| 9 |
main/trunk/pym/portage/manifest.py |
| 10 |
Log: |
| 11 |
Fix typos. Thanks to Arfrever Frehtes Taifersar Arahesis |
| 12 |
<Arfrever.FTA@×××××.Com>. |
| 13 |
|
| 14 |
|
| 15 |
Modified: main/trunk/RELEASE-NOTES |
| 16 |
=================================================================== |
| 17 |
--- main/trunk/RELEASE-NOTES 2008-03-30 10:01:18 UTC (rev 9631) |
| 18 |
+++ main/trunk/RELEASE-NOTES 2008-03-30 19:20:46 UTC (rev 9632) |
| 19 |
@@ -22,7 +22,7 @@ |
| 20 |
used without the prefix) |
| 21 |
- they may currently only include simple and versioned atoms or other sets, use |
| 22 |
conditionals or any-of constructs aren't possible yet |
| 23 |
- - emerge makes no difference atm wether you pass a setname or all atoms contained |
| 24 |
+ - emerge makes no difference atm whether you pass a setname or all atoms contained |
| 25 |
in the set to it, this means that without options packages will be remerged if |
| 26 |
already installed, or in the case of --unmerge all atoms in a set will be |
| 27 |
unmerged even if they are depended upon by other packages. This may change in |
| 28 |
|
| 29 |
Modified: main/trunk/bin/md5check.py |
| 30 |
=================================================================== |
| 31 |
--- main/trunk/bin/md5check.py 2008-03-30 10:01:18 UTC (rev 9631) |
| 32 |
+++ main/trunk/bin/md5check.py 2008-03-30 19:20:46 UTC (rev 9632) |
| 33 |
@@ -75,7 +75,7 @@ |
| 34 |
if (md5_list[mybn]["MD5"] != md5sums[mybn]["MD5"]) or \ |
| 35 |
(md5_list[mybn]["size"] != md5sums[mybn]["size"]): |
| 36 |
|
| 37 |
- # This associates teh md5 with each file. [md5/size] |
| 38 |
+ # This associates the md5 with each file. [md5/size] |
| 39 |
md5joins = md5_list[mybn][2].split(",") |
| 40 |
md5joins = (" ["+md5_list[mybn][0]+"/"+md5_list[mybn][1]+"],").join(md5joins) |
| 41 |
md5joins += " ["+md5_list[mybn][0]+"/"+md5_list[mybn][1]+"]" |
| 42 |
|
| 43 |
Modified: main/trunk/bin/repoman |
| 44 |
=================================================================== |
| 45 |
--- main/trunk/bin/repoman 2008-03-30 10:01:18 UTC (rev 9631) |
| 46 |
+++ main/trunk/bin/repoman 2008-03-30 19:20:46 UTC (rev 9632) |
| 47 |
@@ -224,9 +224,9 @@ |
| 48 |
|
| 49 |
if opts.mode == 'commit' and not (opts.force or opts.pretend): |
| 50 |
if opts.ignore_masked: |
| 51 |
- parser.error('Commit mode and --ignore-masked are not compatable') |
| 52 |
+ parser.error('Commit mode and --ignore-masked are not compatible') |
| 53 |
if opts.without_mask: |
| 54 |
- parser.error('Commit mode and --without-mask are not compatable') |
| 55 |
+ parser.error('Commit mode and --without-mask are not compatible') |
| 56 |
|
| 57 |
# Use the verbosity and quiet options to fiddle with the loglevel appropriately |
| 58 |
for val in range(opts.verbosity): |
| 59 |
@@ -1074,7 +1074,7 @@ |
| 60 |
fails["KEYWORDS.stupid"].append(x+"/"+y+".ebuild") |
| 61 |
|
| 62 |
""" |
| 63 |
- Ebuilds that inherit a "Live" eclasss (darcs,subversion,git,cvs,etc..) should |
| 64 |
+ Ebuilds that inherit a "Live" eclass (darcs,subversion,git,cvs,etc..) should |
| 65 |
not be allowed to be marked stable |
| 66 |
""" |
| 67 |
if set(["darcs","cvs","subversion","git"]).intersection( |
| 68 |
|
| 69 |
Modified: main/trunk/pym/portage/manifest.py |
| 70 |
=================================================================== |
| 71 |
--- main/trunk/pym/portage/manifest.py 2008-03-30 10:01:18 UTC (rev 9631) |
| 72 |
+++ main/trunk/pym/portage/manifest.py 2008-03-30 19:20:46 UTC (rev 9632) |
| 73 |
@@ -262,7 +262,7 @@ |
| 74 |
del self.fhashdict[ftype][fname] |
| 75 |
|
| 76 |
def hasFile(self, ftype, fname): |
| 77 |
- """ Return wether the Manifest contains an entry for the given type,filename pair """ |
| 78 |
+ """ Return whether the Manifest contains an entry for the given type,filename pair """ |
| 79 |
return (fname in self.fhashdict[ftype]) |
| 80 |
|
| 81 |
def findFile(self, fname): |
| 82 |
|
| 83 |
-- |
| 84 |
gentoo-commits@l.g.o mailing list |
Archives