| 1 |
Author: idl0r |
| 2 |
Date: 2009-09-09 17:32:18 +0000 (Wed, 09 Sep 2009) |
| 3 |
New Revision: 679 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/gentoolkit-dev/ChangeLog |
| 7 |
trunk/gentoolkit-dev/src/imlate/imlate |
| 8 |
Log: |
| 9 |
Remove EXPERIMENTAL option, make it default. |
| 10 |
|
| 11 |
|
| 12 |
Modified: trunk/gentoolkit-dev/ChangeLog |
| 13 |
=================================================================== |
| 14 |
--- trunk/gentoolkit-dev/ChangeLog 2009-09-09 16:22:35 UTC (rev 678) |
| 15 |
+++ trunk/gentoolkit-dev/ChangeLog 2009-09-09 17:32:18 UTC (rev 679) |
| 16 |
@@ -5,6 +5,7 @@ |
| 17 |
Add search by herd or maintainer. |
| 18 |
Add single package mode. |
| 19 |
Automatic detection of TARGET/MAIN-_ARCH. |
| 20 |
+ Remove EXPERIMENTAL option, make it default. |
| 21 |
|
| 22 |
2009-09-06: Christian Ruppert <idl0r@g.o> |
| 23 |
* src/echangelog/echangelog: Fix regex, thanks to Magnus Granberg (zorry) <zorry@×××.nu>. |
| 24 |
|
| 25 |
Modified: trunk/gentoolkit-dev/src/imlate/imlate |
| 26 |
=================================================================== |
| 27 |
--- trunk/gentoolkit-dev/src/imlate/imlate 2009-09-09 16:22:35 UTC (rev 678) |
| 28 |
+++ trunk/gentoolkit-dev/src/imlate/imlate 2009-09-09 17:32:18 UTC (rev 679) |
| 29 |
@@ -299,8 +299,7 @@ |
| 30 |
elif kwd == exclude: |
| 31 |
kwd_type = 3 |
| 32 |
break |
| 33 |
- # EXPERIMENTAL |
| 34 |
- elif kwd == exclude_all and conf["EXPERIMENTAL"]: |
| 35 |
+ elif kwd == exclude_all: |
| 36 |
kwd_type = 4 |
| 37 |
elif kwd == testing: |
| 38 |
kwd_type = 1 |
| 39 |
@@ -309,10 +308,9 @@ |
| 40 |
# ignore -arch and already stabilized packages |
| 41 |
if kwd_type == 3 or kwd_type == 2: |
| 42 |
continue |
| 43 |
- # EXPERIMENTAL |
| 44 |
- # drop packages without ~arch or arch but -* |
| 45 |
+ # drop packages with -* and without ~arch or arch |
| 46 |
# even if there is another version which includes arch or ~arch |
| 47 |
- if kwd_type == 4 and conf["EXPERIMENTAL"]: |
| 48 |
+ if kwd_type == 4: |
| 49 |
continue |
| 50 |
# drop "stable candidates" with mtime < 30 days |
| 51 |
# Shall we use gmtime/UTC here? |
| 52 |
@@ -368,7 +366,7 @@ |
| 53 |
_cat = _cat.strip() |
| 54 |
_mycats.append(_cat ) |
| 55 |
if _cat not in mysettings.categories: |
| 56 |
- raise ValueError, "invalid categorie for -C switch '%s'" % _cat |
| 57 |
+ raise ValueError, "invalid category for -C switch '%s'" % _cat |
| 58 |
mysettings.categories = _mycats |
| 59 |
|
| 60 |
# maybe thats not necessary because we override porttrees below.. |
| 61 |
@@ -418,9 +416,9 @@ |
| 62 |
parser.add_option( "-H", "--herd", dest = "herd", action = "store", type = "string", |
| 63 |
help = "Show only packages from the specified herd", metavar = "HERD", default = None) |
| 64 |
|
| 65 |
- # EXPERIMENTAL |
| 66 |
- parser.add_option( "-e", "--experimental", dest = "experimental", action = "store_true", default = False, |
| 67 |
- help = "enables experimental functions/features (have a look for # EXPERIMENTAL comments in the source) [default: %default]" ) |
| 68 |
+# # EXPERIMENTAL |
| 69 |
+# parser.add_option( "-e", "--experimental", dest = "experimental", action = "store_true", default = False, |
| 70 |
+# help = "enables experimental functions/features (have a look for # EXPERIMENTAL comments in the source) [default: %default]" ) |
| 71 |
|
| 72 |
parser.add_option( "-C", "--category", "--categories", dest = "categories", action = "store", default = None, |
| 73 |
metavar = "CATEGORIES", |
| 74 |
@@ -467,7 +465,7 @@ |
| 75 |
conf["STABLE"] = options.stable |
| 76 |
conf["KEYWORD"] = options.keyword |
| 77 |
|
| 78 |
- conf["EXPERIMENTAL"] = options.experimental |
| 79 |
+# conf["EXPERIMENTAL"] = options.experimental |
| 80 |
conf["CATEGORIES"] = options.categories |
| 81 |
|
| 82 |
conf["MAINTAINER"] = options.maintainer |
Archives