1. GBS buildlog will be copied after removing version,release number

2. Modify binary-list package calculation algorithm on gbs dependency build

Change-Id: I1832963af8cb207034cf5841e9746a4958908c23

diff --git a/common/gbsutils.py b/common/gbsutils.py
index bc352c5..b1cf688 100644 (file)
--- a/common/gbsutils.py
+++ b/common/gbsutils.py
@@ -549,7 +549,7 @@ class GBSBuild:
         for git_name in self.build_pkg_list.keys():
             for each_file in os.listdir(os.path.join(self.prj_src_root,repo,git_name,'packaging')):
                 if each_file.endswith('.spec'):
-                    binary_list += each_file.rstrip('.spec')+','
+                    binary_list += each_file.replace('.spec','')+','
         binary_list = binary_list.rstrip(',')
 
         print 'build spec file list: %s' %binary_list
@@ -681,12 +681,12 @@ class GBSBuild:
                 for success_pkg in os.listdir(success_log_root):
                     src_file=success_log_root+'/'+success_pkg+'/log.txt'
                     print 'success_log_dest: %s ,success_pkg: %s' %(success_log_dest,success_pkg)
-                    dest_file=success_log_dest+'/'+re.findall('\D*\d*\D+\d*[-]',success_pkg)[0].rstrip('-')+'.buildlog.txt'
+                    dest_file=success_log_dest+'/'+re.sub('-\d+|.\d+','',success_pkg)+'.buildlog.txt'
                     shutil.copy(src_file,dest_file)
                 #failed packages
                 for fail_pkg in os.listdir(fail_log_root):
                     src_file=fail_log_root+'/'+fail_pkg+'/log.txt'
-                    dest_file=fail_log_dest+'/'+re.findall('\D*\d*\D+\d*[-]',fail_pkg)[0].rstrip('-')+'.buildlog.txt'
+                    dest_file=fail_log_dest+'/'+re.sub('-\d+|.\d+','',fail_pkg)+'.buildlog.txt'
                     shutil.copy(src_file,dest_file)
                 #Remove folder if there is no file in arch directory
                 if len(os.walk(success_log_dest).next()[2]) == 0: