[arch-commits] Commit in snapd/trunk (PKGBUILD fix_test.patch)

[Timothy Redaelli]

    Date: Wednesday, July 27, 2016 @ 15:53:59
  Author: tredaelli
Revision: 184515

upgpkg: snapd 2.11-1

Modified:
  snapd/trunk/PKGBUILD
Deleted:
  snapd/trunk/fix_test.patch

----------------+
 PKGBUILD       |   15 +++++++++------
 fix_test.patch |   33 ---------------------------------
 2 files changed, 9 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-27 15:31:43 UTC (rev 184514)
+++ PKGBUILD	2016-07-27 15:53:59 UTC (rev 184515)
@@ -3,7 +3,7 @@
 # Contributor: Zygmunt Krynicki <me at zygoon dot pl>
 
 pkgname=snapd
-pkgver=2.0.10
+pkgver=2.11
 pkgrel=1
 pkgdesc="Service and tools for management of snap packages."
 arch=('i686' 'x86_64')
@@ -15,18 +15,21 @@
 options=('!strip' 'emptydirs')
 install=snapd.install
 source=("git+https://github.com/snapcore/$pkgname.git#tag=$pkgver"
-        'snapd.sh'
-        'fix_test.patch')
+        'snapd.sh')
 md5sums=('SKIP'
-         '1d841a1d09ba86945551dfc5c5658b2e'
-         '7fd19e053051825b189914cedb95c3e7')
+         '1d841a1d09ba86945551dfc5c5658b2e')
 
 _gourl=github.com/snapcore/snapd
 
 prepare() {
   cd "$pkgname"
-  patch -Np1 -i "$srcdir/fix_test.patch"
 
+  # daemon: always mock release info in tests
+  git cherry-pick -n 2840c2a37ef5adf50d93461920f3e2140617bd54
+
+  # osutil: support both "nobody" and "nogroup" for grpnam tests
+  git cherry-pick -n de99c096641e22dc57de3a581a3459ab65c9cf4d
+
   # Use $srcdir/go as our GOPATH
   export GOPATH="$srcdir/go"
   mkdir -p "$GOPATH"

Deleted: fix_test.patch
===================================================================
--- fix_test.patch	2016-07-27 15:31:43 UTC (rev 184514)
+++ fix_test.patch	2016-07-27 15:53:59 UTC (rev 184515)
@@ -1,33 +0,0 @@
-From b66d3ea328ee42d3d4f56ed9736c315833dee67d Mon Sep 17 00:00:00 2001
-From: Timothy Redaelli <timothy.redaelli at gmail.com>
-Date: Fri, 1 Jul 2016 15:28:46 +0200
-Subject: [PATCH] Fix ./run-checks --static
-
-Python doesn't like LANG=C.UTF-8 so just open the files
-using UTF-8 directly
----
- mdlint.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mdlint.py b/mdlint.py
-index 533c812..a1bd4ac 100755
---- a/mdlint.py
-+++ b/mdlint.py
-@@ -7,7 +7,7 @@
- # http://pythonhosted.org/Markdown/
- 
- import sys
--
-+import codecs
- 
- def lint_li(fname, text):
-     """Ensure that the list-items are multiplies of 4"""
-@@ -23,7 +23,7 @@ def lint(md_files):
-     """lint all md files"""
-     all_clean = True
-     for md in md_files:
--        with open(md) as f:
-+        with codecs.open(md, "r", "utf-8") as f:
-             buf = f.read()
-             for fname, func in globals().items():
-                 if fname.startswith("lint_"):