From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Tue, 23 Sep 2008 16:55:51 +0000 (-0700)
Subject: setup: fix a cut-and-paste error in the fallback to parsing /etc/lsb-release
X-Git-Url: https://git.rkrishnan.org/listings/pb2server.py?a=commitdiff_plain;h=37dd91238b0aac7e2069a765bc0b37a815280c59;p=tahoe-lafs%2Ftahoe-lafs.git

setup: fix a cut-and-paste error in the fallback to parsing /etc/lsb-release
---

diff --git a/src/allmydata/__init__.py b/src/allmydata/__init__.py
index 02ae4fb5..08efc3b8 100644
--- a/src/allmydata/__init__.py
+++ b/src/allmydata/__init__.py
@@ -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: