1 |
commit: 95454bbc6cc295353e1cee2d4205d8a2ca91bf5c |
2 |
Author: Ralph Sennhauser <sera <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 27 18:24:01 2013 +0000 |
4 |
Commit: Ralph Sennhauser <sera <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 28 12:28:00 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/java-config.git;a=commit;h=95454bbc |
7 |
|
8 |
Drop query functions for old style virtuals |
9 |
|
10 |
Old style virtuals (PROVIDES) were banned from tree |
11 |
|
12 |
--- |
13 |
src/java_config_2/Package.py | 9 --------- |
14 |
src/java_config_2/VM.py | 21 --------------------- |
15 |
src/java_config_2/Virtual.py | 6 ------ |
16 |
tests/testsuite/VM.py | 3 --- |
17 |
.../usr/share/java-config-2/vm/blackdown-jdk-1.4.2 | 1 - |
18 |
.../test_env/usr/share/java-config-2/vm/sun-jdk-1.6 | 1 - |
19 |
.../test_env/usr/share/java-config-2/vm/sun-jdk-1.7 | 1 - |
20 |
.../usr/share/java-config-2/vm/sun-jre-bin-1.6 | 1 - |
21 |
8 files changed, 43 deletions(-) |
22 |
|
23 |
diff --git a/src/java_config_2/Package.py b/src/java_config_2/Package.py |
24 |
index 1733ea5..fc0d96d 100644 |
25 |
--- a/src/java_config_2/Package.py |
26 |
+++ b/src/java_config_2/Package.py |
27 |
@@ -66,15 +66,6 @@ class Package: |
28 |
""" |
29 |
return self.__get_deps("OPTIONAL_DEPEND") |
30 |
|
31 |
- def get_provides(self): |
32 |
- """ |
33 |
- Return the virtuals this package provides |
34 |
- """ |
35 |
- pv = self.query('PROVIDES') |
36 |
- if pv: |
37 |
- return pv.split(" ") |
38 |
- return [] |
39 |
- |
40 |
def __get_deps(self, query): |
41 |
""" |
42 |
Internal function to get package's (optional) dependencies; |
43 |
|
44 |
diff --git a/src/java_config_2/VM.py b/src/java_config_2/VM.py |
45 |
index 2c1b407..abd6fb5 100644 |
46 |
--- a/src/java_config_2/VM.py |
47 |
+++ b/src/java_config_2/VM.py |
48 |
@@ -100,25 +100,4 @@ class VM: |
49 |
raise PermissionError |
50 |
return None |
51 |
|
52 |
- def get_provides(self): |
53 |
- if 'PROVIDES' in self.config: |
54 |
- return self.config['PROVIDES'].split(' ') |
55 |
- return [] |
56 |
- |
57 |
- def provides(self, virtuals): |
58 |
- if 'PROVIDES' in self.config: |
59 |
- vp = self.config['PROVIDES'].split(' ') |
60 |
- else: |
61 |
- return False |
62 |
- |
63 |
- found = 0 |
64 |
- |
65 |
- for virtual in virtuals: |
66 |
- if virtual in vp: |
67 |
- found += 1 |
68 |
- else: |
69 |
- return False |
70 |
- |
71 |
- return found == len(virtuals) |
72 |
- |
73 |
# vim:set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap: |
74 |
|
75 |
diff --git a/src/java_config_2/Virtual.py b/src/java_config_2/Virtual.py |
76 |
index b865d05..e0834a0 100644 |
77 |
--- a/src/java_config_2/Virtual.py |
78 |
+++ b/src/java_config_2/Virtual.py |
79 |
@@ -197,12 +197,6 @@ class Virtual(Package): |
80 |
except: |
81 |
return [] |
82 |
|
83 |
- def get_provides(self): |
84 |
- """ |
85 |
- Return the virtuals this package provides |
86 |
- """ |
87 |
- return self.get_provider().get_provides() |
88 |
- |
89 |
def get_provider(self): |
90 |
""" |
91 |
Return whether a package is to be used by the Virtual. |
92 |
|
93 |
diff --git a/tests/testsuite/VM.py b/tests/testsuite/VM.py |
94 |
index 5f1c477..081b5fc 100644 |
95 |
--- a/tests/testsuite/VM.py |
96 |
+++ b/tests/testsuite/VM.py |
97 |
@@ -15,9 +15,6 @@ class TestVM(unittest.TestCase): |
98 |
self.ibm = em.get_vm('ibm-jdk-bin-1.5') |
99 |
self.black = em.get_vm('blackdown-jdk-1.4.2') |
100 |
|
101 |
- def test_empty_provide(self): |
102 |
- self.assertFalse(self.ibm.provides("foobar")) |
103 |
- |
104 |
def test_name(self): |
105 |
self.assertEqual(self.ibm.name(), 'ibm-jdk-bin-1.5') |
106 |
|
107 |
|
108 |
diff --git a/tests/testsuite/test_env/usr/share/java-config-2/vm/blackdown-jdk-1.4.2 b/tests/testsuite/test_env/usr/share/java-config-2/vm/blackdown-jdk-1.4.2 |
109 |
index 3504f8e..0ed35d3 100644 |
110 |
--- a/tests/testsuite/test_env/usr/share/java-config-2/vm/blackdown-jdk-1.4.2 |
111 |
+++ b/tests/testsuite/test_env/usr/share/java-config-2/vm/blackdown-jdk-1.4.2 |
112 |
@@ -16,5 +16,4 @@ BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:$ |
113 |
ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" |
114 |
GENERATION="2" |
115 |
VMHANDLE="blackdown-jdk-1.4.2" |
116 |
-PROVIDES="jdbc-stdext" |
117 |
BUILD_ONLY="TRUE" |
118 |
|
119 |
diff --git a/tests/testsuite/test_env/usr/share/java-config-2/vm/sun-jdk-1.6 b/tests/testsuite/test_env/usr/share/java-config-2/vm/sun-jdk-1.6 |
120 |
index 501935e..03b64d8 100644 |
121 |
--- a/tests/testsuite/test_env/usr/share/java-config-2/vm/sun-jdk-1.6 |
122 |
+++ b/tests/testsuite/test_env/usr/share/java-config-2/vm/sun-jdk-1.6 |
123 |
@@ -17,4 +17,3 @@ BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${ |
124 |
GENERATION="2" |
125 |
ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" |
126 |
VMHANDLE="sun-jdk-1.6" |
127 |
-PROVIDES="jdbc-stdext jdbc-rowset" |
128 |
|
129 |
diff --git a/tests/testsuite/test_env/usr/share/java-config-2/vm/sun-jdk-1.7 b/tests/testsuite/test_env/usr/share/java-config-2/vm/sun-jdk-1.7 |
130 |
index 71a5d5b..7afdfb6 100644 |
131 |
--- a/tests/testsuite/test_env/usr/share/java-config-2/vm/sun-jdk-1.7 |
132 |
+++ b/tests/testsuite/test_env/usr/share/java-config-2/vm/sun-jdk-1.7 |
133 |
@@ -16,4 +16,3 @@ BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.jar:${JAVA_ |
134 |
GENERATION="2" |
135 |
ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" |
136 |
VMHANDLE="sun-jdk-1.7" |
137 |
-PROVIDES="jdbc-stdext jdbc-rowset" |
138 |
|
139 |
diff --git a/tests/testsuite/test_env/usr/share/java-config-2/vm/sun-jre-bin-1.6 b/tests/testsuite/test_env/usr/share/java-config-2/vm/sun-jre-bin-1.6 |
140 |
index b9f6fdd..ecb17f6 100644 |
141 |
--- a/tests/testsuite/test_env/usr/share/java-config-2/vm/sun-jre-bin-1.6 |
142 |
+++ b/tests/testsuite/test_env/usr/share/java-config-2/vm/sun-jre-bin-1.6 |
143 |
@@ -16,4 +16,3 @@ BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${ |
144 |
GENERATION="2" |
145 |
ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH MANPATH" |
146 |
VMHANDLE="sun-jre-bin-1.6" |
147 |
-PROVIDES="jdbc-stdext jdbc-rowset" |