| 1 |
betelgeuse 08/07/02 17:36:28 |
| 2 |
|
| 3 |
Added: java-config-2.1.6-portage-import.patch |
| 4 |
Log: |
| 5 |
Silence warnings given by portage-2.2. |
| 6 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-java/java-config/files/java-config-2.1.6-portage-import.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-config/files/java-config-2.1.6-portage-import.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-config/files/java-config-2.1.6-portage-import.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: java-config-2.1.6-portage-import.patch |
| 15 |
=================================================================== |
| 16 |
diff -ru --exclude .svn tags/2.1.6/src/eselect/java-nsplugin.eselect trunk/src/eselect/java-nsplugin.eselect |
| 17 |
--- tags/2.1.6/src/eselect/java-nsplugin.eselect 2008-04-28 02:58:44.000000000 +0300 |
| 18 |
+++ trunk/src/eselect/java-nsplugin.eselect 2008-06-16 22:00:26.000000000 +0300 |
| 19 |
@@ -68,7 +68,7 @@ |
| 20 |
system_name=$(get_system_plugin_vm) |
| 21 |
|
| 22 |
for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do |
| 23 |
- twaek_list_item ${targets[${i}]} ${system_name} |
| 24 |
+ tweak_list_item ${targets[${i}]} ${system_name} |
| 25 |
done |
| 26 |
} |
| 27 |
|
| 28 |
diff -ru --exclude .svn tags/2.1.6/src/java_config_2/VersionManager.py trunk/src/java_config_2/VersionManager.py |
| 29 |
--- tags/2.1.6/src/java_config_2/VersionManager.py 2008-04-28 02:58:44.000000000 +0300 |
| 30 |
+++ trunk/src/java_config_2/VersionManager.py 2008-07-02 20:24:01.000000000 +0300 |
| 31 |
@@ -71,7 +71,10 @@ |
| 32 |
use = os.environ["USE"] |
| 33 |
|
| 34 |
# Local import to avoid initializing portage elsewhere |
| 35 |
- from portage_dep import use_reduce,paren_reduce |
| 36 |
+ try: |
| 37 |
+ from portage.dep import use_reduce,paren_reduce |
| 38 |
+ except ImportError: |
| 39 |
+ from portage_dep import use_reduce,paren_reduce |
| 40 |
from portage import flatten |
| 41 |
|
| 42 |
# Normalize white space for Portage |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
-- |
| 47 |
gentoo-commits@l.g.o mailing list |
Archives