setup: fix a cut-and-paste error in the fallback to parsing /etc/lsb-release
authorZooko O'Whielacronx <zooko@zooko.com>
Tue, 23 Sep 2008 16:55:51 +0000 (09:55 -0700)
committerZooko O'Whielacronx <zooko@zooko.com>
Tue, 23 Sep 2008 16:55:51 +0000 (09:55 -0700)
src/allmydata/__init__.py

index 02ae4fb50725b65180224d7c6af80726a91f8878..08efc3b8a7627bddce1701581c3c66e2be1653af 100644 (file)
@@ -88,11 +88,11 @@ def get_linux_distro():
 
     try:
         etclsbrel = open("/etc/lsb-release", "rU")
-        for inline in etclsbrel:
-            m = _distributor_id_file_re.search(p.stdout.read())
+        for line in etclsbrel:
+            m = _distributor_id_file_re.search(line)
             if m:
                 _distname = m.group(1).strip()
-            m = _release_cmdline_re.search(p.stdout.read())
+            m = _release_file_re.search(line)
             if m:
                 _version = m.group(1).strip()
     except EnvironmentError: