[meego-commits] 14857: Changes to devel:tools:building/meego-compliance-tools

[Wang Quanxian]

Hi,
I have made the following changes to meego-compliance-tools in project devel:tools:building. Please review and accept ASAP.

Thank You,
Wang Quanxian

[This message was auto-generated]

---

Request #14857:

  submit:   home:quanxianwang:branches:devel:tools:building/meego-compliance-tools(r10)(cleanup) -> devel:tools:building/meego-compliance-tools


Message:
    Get the right path from the path information to fix bmc#12526

State:   new          2011-03-16T00:55:14 quanxianwang
Comment: None



changes files:
--------------
--- meego-compliance-tools.changes
+++ meego-compliance-tools.changes
@@ -0,0 +1,3 @@
+* Wed Mar 16 2011 Quanxian Wang <quanxian.wang at intel.com> - 1.1
+- Get the right path from the path information to fix bmc#12526
+

new:
----
  error_checking.patch

spec files:
-----------
--- meego-compliance-tools.spec
+++ meego-compliance-tools.spec
@@ -1,6 +1,6 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.22git
+# Generated by: spectacle version 0.21
 # 
 # >> macros
 # << macros
@@ -16,6 +16,7 @@
 URL:        http://meego.gitorious.org/meego-developer-tools/meego-compliance-tools
 Source0:    meego-compliance-tools-%{version}.tar.gz
 Source100:  meego-compliance-tools.yaml
+Patch0:     error_checking.patch
 Requires:   python
 BuildRequires:  python-devel
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -51,6 +52,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+# error_checking.patch
+%patch0 -p1
 # >> setup
 # << setup
 

dsc files:
----------

other changes:
--------------

++++++ error_checking.patch (new)
--- error_checking.patch
+++ error_checking.patch
+8c24d918743e20ceba01b64d33db3718561c9ccf
+diff --git a/tools/dist_compliance b/tools/dist_compliance
+index 80dc228..5bbb6ae 100755
+--- a/tools/dist_compliance
++++ b/tools/dist_compliance
+@@ -348,6 +348,19 @@ class DistChecker:
+         total_p = len(self.pkglist.keys())
+ 
+         # check all packages
++        ## first check if all the package in core list exists in ref image.
++        error = False
++        for pkgname in self.pkglist:
++            # check if pkgname exists in list
++            if pkgname not in self.reflist:
++                error = True
++                logger.warning("%s doesn't exist in ref image" % ( pkgname ))
++
++        if error:
++           logger.info('Please make sure your ref image is consistent with your core package list.Thanks')
++           logger.info('Stop continue processing')
++           return 1
++
+         cur_dir = os.getcwd()
+         for pkgname in self.pkglist:
+             cmp_over = False
+@@ -467,6 +480,7 @@ class DistChecker:
+             f.close()
+ 
+         os.chdir(cur_dir)
++        return 0
+ 
+ def main():
+     usage = 'Usage: [sudo] %prog [options]'
+@@ -514,14 +528,14 @@ def main():
+         return 1
+ 
+     checker = DistChecker(ref, tgt, corelist)
+-    checker.do_check()
+-    logdir = checker.getlogdir()
+-    if opts.debug:
+-        logger.info('Intermedia log files in %s' % logdir)
+-
+-    outdir = os.path.abspath(os.path.expanduser(opts.outdir))
+-    reporter.report_dist(logdir, outdir, ref, tgt)
+-    logger.info('All report files are located at: %s' % outdir)
++    if checker.do_check() == 0:
++        logdir = checker.getlogdir()
++        if opts.debug:
++            logger.info('Intermedia log files in %s' % logdir)
++
++        outdir = os.path.abspath(os.path.expanduser(opts.outdir))
++        reporter.report_dist(logdir, outdir, ref, tgt)
++        logger.info('All report files are located at: %s' % outdir)
+ 
+     checker.cleanup()
+ 
+22a0df1b62c5202c1ee230e87908b934b9f6b256
+diff --git a/meego_compliance_tools/utils.py b/meego_compliance_tools/utils.py
+index 3c9b6dc..e1776be 100644
+--- a/meego_compliance_tools/utils.py
++++ b/meego_compliance_tools/utils.py
+@@ -137,12 +137,19 @@ def image_uncompress(fpath, tmpd):
+         # find out the root dir of runtime system in image
+         while True:
+             member = tar.next()
+-            if member.name.endswith('bin/'):
+-                rootdir = os.path.join(tmpd, member.name.rstrip('bin/'))
++            if member:
++                #logger.info('member of tar:%s ...' % member.name)
++                if member.name.endswith('/root'):
++                    rootdir = os.path.join(tmpd, member.name.rstrip('/root'))
++                    break
++            else:
++                #logger.info('member of tar is null')
+                 break
+ 
+         if not rootdir:
+-            logger.error('Image file: %s has no system runtime files, abort' % fname)
++            logger.error('Image file: %s has no system runtime files,\
++\nfor example /root dir, please check your package.\
++\nThanks. Abort the program!' % fname)
+             # abort
+ 
+         tar.extractall(path=tmpd)

++++++ meego-compliance-tools.yaml
--- meego-compliance-tools.yaml
+++ meego-compliance-tools.yaml
@@ -22,6 +22,9 @@
 Sources:
     - meego-compliance-tools-%{version}.tar.gz
 
+Patches:
+    - error_checking.patch
+
 Builder: python
 
 SubPackages: