[meego-commits] 11314: Changes to Trunk:Testing/mic2

[Yi Yang]

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

Thank You,
Yi Yang

[This message was auto-generated]

---

Request #11314:

  submit:   devel:tools:building/mic2(r84) -> Trunk:Testing/mic2


Message:
    Update to 0.22.8

State:   new          2010-12-29T00:40:34 yyang
Comment: None



changes files:
--------------
--- mic2.changes
+++ mic2.changes
@@ -0,0 +1,4 @@
+* Mon Dec 27 2010 Yi Yang <yi.y.yang at intel.com> - 0.22.8
+- Update to 0.22.8
+- Fix main repo guess errro
+

old:
----
  mic2-0.22.7.tar.gz

new:
----
  mic2-0.22.8.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.7
+Version:    0.22.8
 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.7
+Version: 0.22.8
 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.8) unstable; urgency=low
+
+  * Release of version (0.22.8)
+
+ -- Yi Yang <yi.y.yang at intel.com>  Mon, 27 Dec 2010 11:24:42 +0800
 mic2 (0.22.7) unstable; urgency=low
 
   * Release of version (0.22.7)

++++++ mic2-0.22.7.tar.gz -> mic2-0.22.8.tar.gz
--- VERSION
+++ VERSION
@@ -1 +1 @@
-0.22.7
+0.22.8
--- doc/mic.1
+++ doc/mic.1
@@ -1,4 +1,4 @@
-.TH MIC "1" "Dec 2010" "mic 0.22.7" "User Commands"
+.TH MIC "1" "Dec 2010" "mic 0.22.8" "User Commands"
 .SH NAME
 mic \- MeeGo image command-line tool.
 .SH SYNOPSIS
--- mic/imgcreate/bootstrap.py
+++ mic/imgcreate/bootstrap.py
@@ -422,8 +422,9 @@
     f = open(repomd, "r")
     content = f.read()
     f.close()
-    m = re.match(".*href=\"(.*?comps.*?\.xml.*?)\"", content, re.M | re.S)
-    if not m:
+    m1 = re.match(".*href=\"(.*?comps.*?\.xml.*?)\"", content, re.M | re.S)
+    m2 = re.match(".*href=\"(.*?patterns*?\.xml.*?)\"", content, re.M | re.S)
+    if not m1 and not m2:
         return False
     sqlitedb = "%s/%s/.tmp.primary.sqlite" % (cachedir, reponame)
     con = sqlite.connect(sqlitedb)
--- 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.7
+Version:    0.22.8
 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.7
+Version: 0.22.8
 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.7
+Version: 0.22.8
 Release: 1
 Group: System/Base
 License: GPLv2