[meego-commits] 9050: Changes to Tools:Building/mic2

[Yi Yang]

Hi,
I have made the following changes to mic2 in project Tools:Building. Please review and accept ASAP.

Thank You,
Yi Yang

[This message was auto-generated]

---

Request #9050:

  submit:   devel:tools:building/mic2(r70) -> Tools:Building/mic2


Message:
    Update to 0.22.2 (fixed BMC#9088 and #9108)

State:   new          2010-10-29T00:53:04 yyang
Comment: None



changes files:
--------------
--- mic2.changes
+++ mic2.changes
@@ -0,0 +1,3 @@
+* Fri Oct 29 2010 Yi Yang <yi.y.yang at intel.com> - 0.22.2
+- Update to 0.22.2 (fixed BMC #9088 and #9108)
+

old:
----
  mic2-0.22.1.tar.gz

new:
----
  mic2-0.22.2.tar.gz

spec files:
-----------
--- mic2.spec
+++ mic2.spec
@@ -8,7 +8,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:       mic2
 Summary:    Tools for building images for MeeGo
-Version:    0.22.1
+Version:    0.22.2
 Release:    1
 Group:      System/Base
 License:    GPLv2

dsc files:
----------
--- mic2.dsc
+++ mic2.dsc
@@ -1,7 +1,7 @@
 Format: 1.0
 Source: mic2
 Binary: mic2
-Version: 0.22.1
+Version: 0.22.2
 Maintainer: Yi Yang <yi.y.yang at intel.com>
 Homepage: http://www.meego.com
 Architecture: all

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

++++++ debian.changelog
--- debian.changelog
+++ debian.changelog
@@ -1,3 +1,8 @@
+mic2 (0.22.2) unstable; urgency=low
+
+  * Release of version (0.22.2)
+
+ -- Yi Yang <yi.y.yang at intel.com>  Fri, 29 Oct 2010 14:26:42 +0800
 mic2 (0.22.1) unstable; urgency=low
 
   * Release of version (0.22.1)

++++++ mic2-0.22.1.tar.gz -> mic2-0.22.2.tar.gz
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,30 @@
+commit 227907be2a612e3b4de4cf8878b9889e650fb022
+Author: Yi Yang <yi.y.yang at intel.com>
+Date:   Fri Oct 29 14:11:16 2010 +0800
+
+    Fix comps.xml match issue in repomd.xml
+    
+    Note: fix bug #9108, in MeeGo 1.1 repo, comps.xml is named as
+    comps-1.1.xml so that mic2 considers it as questionable repo.
+
+commit 13dce6b4c1073e29e2aec1ed904dbe517e14e337
+Author: Marko Saukko <marko.saukko at gmail.com>
+Date:   Thu Oct 28 17:11:53 2010 +0300
+
+    If self.target_arch is empty then can't do operations to it.
+
+commit 285dbe20d5b98c6f50115f34f17db648ddcb68b4
+Author: Marko Saukko <marko.saukko at gmail.com>
+Date:   Wed Oct 27 10:38:58 2010 +0300
+
+    Lets not hide the error messages. Eventually we should hide the error messages from users, but if this is hidden it makes debugging in problem cases much harder.
+
+commit 02b2735ad11e4ff9b57ad354ea2d86921d109d10
+Author: Yi Yang <yi.y.yang at intel.com>
+Date:   Fri Oct 22 09:27:23 2010 +0800
+
+    Cut release 0.22.1
+
 commit 7ce4300ad6b8a3eddb1b5629533a7d53196e7a70
 Author: Yi Yang <yi.y.yang at intel.com>
 Date:   Fri Oct 22 09:17:55 2010 +0800
--- VERSION
+++ VERSION
@@ -1 +1 @@
-0.22.1
\ No newline at end of file
+0.22.2
\ No newline at end of file
--- doc/mic.1
+++ doc/mic.1
@@ -1,4 +1,4 @@
-.TH MIC "1" "Sep 2010" "mic 0.21.1" "User Commands"
+.TH MIC "1" "Oct 2010" "mic 0.22.2" "User Commands"
 .SH NAME
 mic \- MeeGo image command-line tool.
 .SH SYNOPSIS
--- mic/appcreate/appliance.py
+++ mic/appcreate/appliance.py
@@ -413,7 +413,7 @@
 
     def _write_image_xml(self):
         imgarch = "i686"
-        if self.target_arch.startswith("arm"):
+        if self.target_arch and self.target_arch.startswith("arm"):
             imgarch = "arm"
         xml = "<image>\n"
 
--- mic/imgcreate/bootstrap.py
+++ mic/imgcreate/bootstrap.py
@@ -416,7 +416,7 @@
     f = open(repomd, "r")
     content = f.read()
     f.close()
-    m = re.match(".*href=\"(.*?comps.xml.*?)\"", content, re.M | re.S)
+    m = re.match(".*href=\"(.*?comps.*?\.xml.*?)\"", content, re.M | re.S)
     if not m:
         return False
     sqlitedb = "%s/%s/.tmp.primary.sqlite" % (cachedir, reponame)
--- mic/imgcreate/creator.py
+++ mic/imgcreate/creator.py
@@ -899,7 +899,8 @@
             self.__save_repo_keys(repodata)
             kickstart.MoblinRepoConfig(self._instroot).apply(ksh.repo, repodata)
         except:
-            raise CreatorError("Failed to apply configuration to image")
+            print "Failed to apply configuration to image"
+            raise
 
         if not self.target_arch or not self.target_arch.startswith("arm"):
             self._create_bootconfig()
--- mic2.spec
+++ mic2.spec
@@ -8,7 +8,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:       mic2
 Summary:    Tools for building images for MeeGo
-Version:    0.22.1
+Version:    0.22.2
 Release:    1
 Group:      System/Base
 License:    GPLv2
--- mic2.yaml
+++ mic2.yaml
@@ -1,6 +1,6 @@
 Name: mic2
 Summary: Tools for building images for MeeGo
-Version: 0.22.1
+Version: 0.22.2
 Release: 1
 Group: System/Base
 License: GPLv2

++++++ mic2.yaml
--- mic2.yaml
+++ mic2.yaml
@@ -1,6 +1,6 @@
 Name: mic2
 Summary: Tools for building images for MeeGo
-Version: 0.22.1
+Version: 0.22.2
 Release: 1
 Group: System/Base
 License: GPLv2