Changeset 8d1f92f in mainline for contrib

Timestamp:

2015-05-24T09:34:05Z (11 years ago)

Author:

Michal Koutný <xm.koutny+hos@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fc7bf19

Parents:

a18a8b9 (diff), 91deaff (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Sync with mainline

Location:

contrib

Files:

• bazaar/bzreml/__init__.py (modified) (1 diff)
• bazaar/mbprotect/__init__.py (modified) (2 diffs)
• qfs/qfs.sh (modified) (2 diffs)

contrib/bazaar/bzreml/__init__.py

@@ -70 +70 @@
         
         sender_user, sender_email = parseaddr(sender)
-        payload = MIMEText(body.encode("utf-8"), "plain", "utf-8")
+        payload = MIMEText(body.decode("utf-8", 'ignore').encode("utf-8", 'ignore'), "plain", "utf-8")
         
         msg = MIMEMultipart()

contrib/bazaar/mbprotect/__init__.py

@@ -60 +60 @@
                 return
         
-        # First permitted case is appending changesets to main branch.Look for
+        # First permitted case is appending changesets to main branch. Look for
         # old tip in new main branch.
         for revision_id in iter_reverse_revision_history(repo, params.new_revid):
                 if revision_id == params.old_revid:
-                        return  # Found old tip
+                        # Old tip found
+                        return
         
         # Another permitted case is backing out changesets. Look for new tip
@@ -70 +71 @@
         for revision_id in iter_reverse_revision_history(repo, params.old_revid):
                 if revision_id == params.new_revid:
-                        return  # Found new tip
+                        # New tip found
+                        return
         
         # Trying to do something else. Reject the change.

contrib/qfs/qfs.sh

@@ -29 +29 @@
 #
 
-VERSION=2.2.0
+VERSION=2.3.0
 BASENAME=qemu-${VERSION}
 BASENAME_MASTER=qemu-master
@@ -36 +36 @@
 URL=http://wiki.qemu-project.org/download/${TARBALL}
 REPO=git://git.qemu.org/qemu.git
-MD5="f7a5e2da22d057eb838a91da7aff43c8"
+MD5="2fab3ea4460de9b57192e5b8b311f221"
 
 if [ "$1" == "--master" ]; then