From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C70D3138247 for ; Sat, 28 Dec 2013 13:15:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5979CE0A88; Sat, 28 Dec 2013 13:15:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C4B2DE0A88 for ; Sat, 28 Dec 2013 13:15:45 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B054533F74B for ; Sat, 28 Dec 2013 13:15:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EAB42E5535 for ; Sat, 28 Dec 2013 13:15:42 +0000 (UTC) From: "Ralph Sennhauser" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ralph Sennhauser" Message-ID: <1388233680.95454bbc6cc295353e1cee2d4205d8a2ca91bf5c.sera@gentoo> Subject: [gentoo-commits] proj/java-config:master commit in: src/java_config_2/, tests/testsuite/test_env/usr/share/java-config-2/vm/, ... X-VCS-Repository: proj/java-config X-VCS-Files: src/java_config_2/Package.py src/java_config_2/VM.py src/java_config_2/Virtual.py tests/testsuite/VM.py tests/testsuite/test_env/usr/share/java-config-2/vm/blackdown-jdk-1.4.2 tests/testsuite/test_env/usr/share/java-config-2/vm/sun-jdk-1.6 tests/testsuite/test_env/usr/share/java-config-2/vm/sun-jdk-1.7 tests/testsuite/test_env/usr/share/java-config-2/vm/sun-jre-bin-1.6 X-VCS-Directories: src/java_config_2/ tests/testsuite/test_env/usr/share/java-config-2/vm/ tests/testsuite/ X-VCS-Committer: sera X-VCS-Committer-Name: Ralph Sennhauser X-VCS-Revision: 95454bbc6cc295353e1cee2d4205d8a2ca91bf5c X-VCS-Branch: master Date: Sat, 28 Dec 2013 13:15:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fd172b1b-15bf-4953-a79a-ea5fc0863b93 X-Archives-Hash: 4a5712228c77ce30f9f7f4cc70fdf8e7 commit: 95454bbc6cc295353e1cee2d4205d8a2ca91bf5c Author: Ralph Sennhauser gentoo org> AuthorDate: Fri Dec 27 18:24:01 2013 +0000 Commit: Ralph Sennhauser gentoo org> CommitDate: Sat Dec 28 12:28:00 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/java-config.git;a=commit;h=95454bbc Drop query functions for old style virtuals Old style virtuals (PROVIDES) were banned from tree --- src/java_config_2/Package.py | 9 --------- src/java_config_2/VM.py | 21 --------------------- src/java_config_2/Virtual.py | 6 ------ tests/testsuite/VM.py | 3 --- .../usr/share/java-config-2/vm/blackdown-jdk-1.4.2 | 1 - .../test_env/usr/share/java-config-2/vm/sun-jdk-1.6 | 1 - .../test_env/usr/share/java-config-2/vm/sun-jdk-1.7 | 1 - .../usr/share/java-config-2/vm/sun-jre-bin-1.6 | 1 - 8 files changed, 43 deletions(-) diff --git a/src/java_config_2/Package.py b/src/java_config_2/Package.py index 1733ea5..fc0d96d 100644 --- a/src/java_config_2/Package.py +++ b/src/java_config_2/Package.py @@ -66,15 +66,6 @@ class Package: """ return self.__get_deps("OPTIONAL_DEPEND") - def get_provides(self): - """ - Return the virtuals this package provides - """ - pv = self.query('PROVIDES') - if pv: - return pv.split(" ") - return [] - def __get_deps(self, query): """ Internal function to get package's (optional) dependencies; diff --git a/src/java_config_2/VM.py b/src/java_config_2/VM.py index 2c1b407..abd6fb5 100644 --- a/src/java_config_2/VM.py +++ b/src/java_config_2/VM.py @@ -100,25 +100,4 @@ class VM: raise PermissionError return None - def get_provides(self): - if 'PROVIDES' in self.config: - return self.config['PROVIDES'].split(' ') - return [] - - def provides(self, virtuals): - if 'PROVIDES' in self.config: - vp = self.config['PROVIDES'].split(' ') - else: - return False - - found = 0 - - for virtual in virtuals: - if virtual in vp: - found += 1 - else: - return False - - return found == len(virtuals) - # vim:set expandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap: diff --git a/src/java_config_2/Virtual.py b/src/java_config_2/Virtual.py index b865d05..e0834a0 100644 --- a/src/java_config_2/Virtual.py +++ b/src/java_config_2/Virtual.py @@ -197,12 +197,6 @@ class Virtual(Package): except: return [] - def get_provides(self): - """ - Return the virtuals this package provides - """ - return self.get_provider().get_provides() - def get_provider(self): """ Return whether a package is to be used by the Virtual. diff --git a/tests/testsuite/VM.py b/tests/testsuite/VM.py index 5f1c477..081b5fc 100644 --- a/tests/testsuite/VM.py +++ b/tests/testsuite/VM.py @@ -15,9 +15,6 @@ class TestVM(unittest.TestCase): self.ibm = em.get_vm('ibm-jdk-bin-1.5') self.black = em.get_vm('blackdown-jdk-1.4.2') - def test_empty_provide(self): - self.assertFalse(self.ibm.provides("foobar")) - def test_name(self): self.assertEqual(self.ibm.name(), 'ibm-jdk-bin-1.5') 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 index 3504f8e..0ed35d3 100644 --- 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 @@ -16,5 +16,4 @@ BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:$ ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" GENERATION="2" VMHANDLE="blackdown-jdk-1.4.2" -PROVIDES="jdbc-stdext" BUILD_ONLY="TRUE" 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 index 501935e..03b64d8 100644 --- 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 @@ -17,4 +17,3 @@ BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${ GENERATION="2" ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" VMHANDLE="sun-jdk-1.6" -PROVIDES="jdbc-stdext jdbc-rowset" 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 index 71a5d5b..7afdfb6 100644 --- 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 @@ -16,4 +16,3 @@ BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.jar:${JAVA_ GENERATION="2" ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" VMHANDLE="sun-jdk-1.7" -PROVIDES="jdbc-stdext jdbc-rowset" 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 index b9f6fdd..ecb17f6 100644 --- 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 @@ -16,4 +16,3 @@ BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${ GENERATION="2" ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH MANPATH" VMHANDLE="sun-jre-bin-1.6" -PROVIDES="jdbc-stdext jdbc-rowset"