Merge lp:~mvo/pkgme-devportal/lib-overrides-fixes into lp:pkgme-devportal

[Michael Vogt]

Make the lib overrides work by making configglue case-sensitive and fixing the default for libgl1-mesa-glx (mvo)

This branch fixes some issues in my previous lib-overrides work:
- its "libGL.so.1" not "libgl.so.1" (case matters)
- the configglue code by default is not case-sensitive so that needs to be tweaks
- the example config is fixed to actually work
- the test is improved to really test the config values instead of the default values

Amazing how much issues such a small branch can have :/

[lp:~mvo/pkgme-devportal/lib-overrides-fixes]

58. By Michael Vogt on 2012-07-17

adjust the naming to make the config file more readable

[Jonathan Lange (jml)]

Looks good. Thanks.

Please remove the XXX comment about lucid before landing.
 a) we don't deploy to lucid any more, or support it either
 b) tarmac will catch it anyway

[Jonathan Lange (jml)]

review: Approve

[lp:~mvo/pkgme-devportal/lib-overrides-fixes]

59. By Michael Vogt on 2012-07-17

devportalbinary/configuration.py: remove configglue.pyschema fallbacks as they should be no longer needed (thanks to jml for this!)

=== modified file 'devportalbinary/binary.py'
--- devportalbinary/binary.py	2012-07-16 16:14:46 +0000
+++ devportalbinary/binary.py	2012-07-17 09:24:18 +0000
@@ -161,7 +161,7 @@
 
 def get_packages_for_libraries(library_names, arch):
     conf = load_configuration()
-    lib_overrides = conf.options.lib_overrides_overrides
+    lib_overrides = conf.options.libraries_overrides
     db = PackageDatabase.create()
     deps = set()
     for lib in library_names:

=== modified file 'devportalbinary/configuration.py'
--- devportalbinary/configuration.py	2012-07-16 16:14:46 +0000
+++ devportalbinary/configuration.py	2012-07-17 09:24:18 +0000
@@ -1,24 +1,14 @@
 import os
 
-try:
-    from configglue import glue
-except ImportError:
-    from configglue.pyschema import glue
+from configglue import glue
+from configglue import parser
 
-try:
-    from configglue.schema import (
-        Schema,
-        Section,
-        DictOption,
-        StringOption,
+from configglue.schema import (
+    Schema,
+    Section,
+    DictOption,
+    StringOption,
     )
-except ImportError:
-    from configglue.pyschema.schema import (
-        Schema,
-        ConfigSection as Section,
-        DictConfigOption as DictOption,
-        StringConfigOption as StringOption,
-        )
 
 
 # XXX: 'pkgme-binary' is the historic name of this package.  Change this
@@ -51,12 +41,12 @@
         help='To scan binary or source packages.')
 
     # overrides
-    lib_overrides = Section()
-    overrides = { 'libasound.so.2': 'libasound2',
-                  'libgl.so.1': 'libgl1-mesa-glx',
-                }
-    lib_overrides.overrides = DictOption(
-        default=overrides,
+    libraries = Section()
+    default_lib_overrides = { 'libasound.so.2': 'libasound2',
+                              'libGL.so.1': 'libgl1-mesa-glx',
+                            }
+    libraries.overrides = DictOption(
+        default=default_lib_overrides,
         help='mapping of library name to pkgname to force picking selected '
              'dependencies')
 
@@ -66,4 +56,6 @@
     config_files = []
     if os.path.exists(config_location):
         config_files.append(config_location)
+    # tell the SchemaConfigParser that we need our data case-sensitive
+    parser.SchemaConfigParser.optionxform = str
     return glue.configglue(DevportalSchema, config_files)

=== modified file 'devportalbinary/testing.py'
--- devportalbinary/testing.py	2012-07-16 18:49:48 +0000
+++ devportalbinary/testing.py	2012-07-17 09:24:18 +0000
@@ -117,17 +117,23 @@
     
     # for the test, needs to be in sync with the config file below
     TEST_LIBS = { 'libasound.so.2' : 'libasound2',
-                  'libgl.so.1' : 'libgl1-mesa-glx',
+                  'libGL.so.1' : 'libgl1-mesa-glx',
+                  'libfoo.so.2' : 'libfoo',
                   }
 
     def setUp(self):
         super(ConfigFileFixture, self).setUp()
         os.makedirs(os.path.dirname(os.path.expanduser(CONF_FILE)))
+        # the syntax for dicts in configglue is slightly arcane, 
         with open(os.path.expanduser(CONF_FILE), 'w') as f:
             f.write("""
-[lib_overrides]
+[libraries]
+overrides = library_overrides
+
+[library_overrides]
 libasound.so.2 = libasound2
-libgl1.so.1 = libglx-mesa-dri
+libGL.so.1 = libgl1-mesa-glx
+libfoo.so.2 = libfoo
 """)
 
 

=== modified file 'devportalbinary/tests/test_binary.py'
--- devportalbinary/tests/test_binary.py	2012-07-16 17:39:13 +0000
+++ devportalbinary/tests/test_binary.py	2012-07-17 09:24:18 +0000
@@ -305,7 +305,7 @@
         self.useFixture(ConfigFileFixture())
         conf = load_configuration()
         self.assertEqual(
-            conf.options.lib_overrides_overrides, ConfigFileFixture.TEST_LIBS)
+            conf.options.libraries_overrides, ConfigFileFixture.TEST_LIBS)
 
     def test_get_lib_overrides_for_packages_for_libraries(self):
         """Test that the configuration file overrides the found