Merge lp:~jml/pkgme/missing-lsb-release into lp:pkgme

[Jonathan Lange]

Handle missing lsb-release

Applies Natalia's patch from bug 1010411.

Changes Distribution to default to UNRELEASED if there's no lsb-release,
rather than just erroring out.

I've updated the patch to use try/except for the main logic, and to have
a test for missing lsb-release, by adding another (bad) layer of abstraction.
Obviously the correct thing to do is to have a full filesystem abstraction.

Thanks,
jml

[James Westby (james-w)]

review: Approve

=== modified file 'NEWS.txt'
--- NEWS.txt	2012-09-12 14:10:16 +0000
+++ NEWS.txt	2012-09-24 11:10:24 +0000
@@ -2,6 +2,15 @@
 NEWS for pkgme
 ==============
 
+0.4.2 (2012-XX-XX)
+==================
+
+Improvements
+------------
+
+ * Distribution defaults to "UNRELEASED" if there is no ``/etc/lsb-release``
+   file, rather than erroring out.  (Natalia)
+
 
 0.4.1 (2012-09-12)
 ==================

=== modified file 'pkgme/info_elements.py'
--- pkgme/info_elements.py	2012-09-12 03:31:40 +0000
+++ pkgme/info_elements.py	2012-09-24 11:10:24 +0000
@@ -1,3 +1,4 @@
+import errno
 import json
 import re
 import rfc822
@@ -151,12 +152,19 @@
     e.g. 'unstable', 'natty', 'oneiric'.
     """
 
+    LSB_RELEASE = '/etc/lsb-release'
+
     @classmethod
     def get_default(cls):
-        with open('/etc/lsb-release') as fp:
-            release_keys = dict(
-                line.strip().split('=') for line in fp.readlines())
-        return release_keys['DISTRIB_CODENAME']
+        try:
+            with open(cls.LSB_RELEASE) as fp:
+                release_keys = dict(
+                    line.strip().split('=') for line in fp.readlines())
+            return release_keys['DISTRIB_CODENAME']
+        except IOError, e:
+            if e.errno == errno.ENOENT:
+                return 'UNRELEASED'
+            raise
 
 
 class BuildDepends(InfoElement):

=== modified file 'pkgme/tests/test_info_elements.py'
--- pkgme/tests/test_info_elements.py	2012-09-03 14:35:54 +0000
+++ pkgme/tests/test_info_elements.py	2012-09-24 11:10:24 +0000
@@ -1,7 +1,15 @@
 import json
+import os
 
-from fixtures import EnvironmentVariableFixture
-from testtools import TestCase
+from fixtures import (
+    EnvironmentVariableFixture,
+    MonkeyPatch,
+    TempDir,
+    )
+from testtools import (
+    skipUnless,
+    TestCase,
+    )
 
 from ..info_elements import (
     BuildDepends,
@@ -146,6 +154,7 @@
 
 class DistributionTestCase(TestCase):
 
+    @skipUnless(os.path.isfile('/etc/lsb-release'), "No current distro")
     def test_defaults_to_current_distro(self):
         with open('/etc/lsb-release') as fp:
             release_keys = dict(
@@ -153,6 +162,15 @@
         self.assertEqual(
             Distribution.get_default(), release_keys['DISTRIB_CODENAME'])
 
+    def test_nonexistent_lsb_release(self):
+        tmp_path = self.useFixture(TempDir()).path
+        nonexistent = os.path.join(tmp_path, 'nonexistent')
+        patch = MonkeyPatch(
+            'pkgme.info_elements.Distribution.LSB_RELEASE', nonexistent)
+        with patch:
+            default_distro = Distribution.get_default()
+        self.assertEqual('UNRELEASED', default_distro)
+
 
 class DebianFormattedTextTests(TestCase):