Patchwork [1/2] classes/sanity: trim trailing newline when reading /etc/redhat-release

login
mail settings
Submitter Paul Eggleton
Date April 18, 2012, 9:56 a.m.
Message ID <8f64a6820985975bbc156d130c3b4f183ac9946b.1334742865.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/26119/
State Accepted
Commit bea0311a6478febe8ab4884fb1c479f610856534
Headers show

Comments

Paul Eggleton - April 18, 2012, 9:56 a.m.
Any trailing whitespace needs to be stripped before comparing it to the
SANITY_TESTED_DISTROS list.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/sanity.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 4d4abd3..3ec449c 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -120,7 +120,7 @@  def check_supported_distro(e):
     if os.path.exists("/etc/redhat-release"):
         f = open("/etc/redhat-release", "r")
         try:
-            distro = f.readline()
+            distro = f.readline().strip()
         finally:
             f.close()
     elif os.path.exists("/etc/SuSE-release"):