Patchwork [RFC] sanity: use lsb distro_identifier

login
register
mail settings
Submitter Martin Jansa
Date Feb. 18, 2013, 11:26 p.m.
Message ID <1361229968-9068-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/44813/
State Accepted
Commit e5f3b992d7edc7b5e2467865a9fad738fbeaf40f
Headers show

Comments

Martin Jansa - Feb. 18, 2013, 11:26 p.m.
* distro_identifier returns lsb_data['Distributor ID']-lsb_data['Release']
  which in some cases is different then lsb_release -d -s, e.g.
  Distributor ID: Ubuntu
  Description:    Ubuntu 12.04 LTS
  Release:        12.04
  Codename:       precise
  But we probably don't need to sanity list each point release in LTS
  and sstate is already using distro_identifier as prefix for native
  sstate archives
* This will need update to SANITY_TESTED_DISTROS (at least
  s/Ubuntu 12.04 LTS/Ubuntu-12.04/g etc), that's why sending as RFC
  first.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/sanity.bbclass | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
Otavio Salvador - Feb. 18, 2013, 11:45 p.m.
On Mon, Feb 18, 2013 at 8:26 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> * distro_identifier returns lsb_data['Distributor ID']-lsb_data['Release']
>   which in some cases is different then lsb_release -d -s, e.g.
>   Distributor ID: Ubuntu
>   Description:    Ubuntu 12.04 LTS
>   Release:        12.04
>   Codename:       precise
>   But we probably don't need to sanity list each point release in LTS
>   and sstate is already using distro_identifier as prefix for native
>   sstate archives
> * This will need update to SANITY_TESTED_DISTROS (at least
>   s/Ubuntu 12.04 LTS/Ubuntu-12.04/g etc), that's why sending as RFC
>   first.
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

It makes sense for me. It easy the maintainence of the tested distros list.

Patch

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index d3bf05a..94c6ce3 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -280,11 +280,8 @@  def check_supported_distro(sanity_data):
             f.close()
     else:
         # Use LSB method
-        import subprocess as sub
         try:
-            p = sub.Popen(['lsb_release','-d','-s'],stdout=sub.PIPE,stderr=sub.PIPE)
-            out, err = p.communicate()
-            distro = out.rstrip()
+            distro = oe.lsb.distro_identifier()
         except Exception:
             distro = None