From: Ian Jackson Subject: [OSSTEST PATCH 09/62] ts-debian-fixup: merge origin extra= to our own if necessary Date: Wed, 10 Apr 2019 15:23:15 +0100 Message-ID: <20190410142408.22848-10-ian.jackson@eu.citrix.com> References: <20190410142408.22848-1-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hEEA9-0006BE-Rc for xen-devel@lists.xenproject.org; Wed, 10 Apr 2019 14:25:17 +0000 In-Reply-To: <20190410142408.22848-1-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Wei Liu List-Id: xen-devel@lists.xenproject.org RnJvbTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KClRoZSBvcmlnaW5hbCBleHRyYT0g d2FzIG5vdCByZW1vdmVkLCBzbyB0aGVyZSB3ZXJlIHR3byBleHRyYT0gaW4gdGhlCnJlc3VsdGlu ZyBjb25maWcgZmlsZS4KCkl0IHdhc24ndCBhIHByb2JsZW0gZm9yIHhsIGJlY2F1c2UgdGhlIHNl Y29uZCBleHRyYT0gdG9vayBwcmVjZWRlbmNlLgpIb3dldmVyIGxpYnZpcnQgdGVzdHMgd291bGQg b25seSBwaWNrIHVwIHRoZSBmaXJzdCBleHRyYT0gc28gdGhleQp3b3JrZWQgYnkgY2hhbmNlLgoK Rml4IHRoaXMgaXNzdWUgYnkgbWVyZ2luZyB0aGUgb3JpZ2luYWwuIElmIHRoZXJlIGlzbid0IGFs cmVhZHkgZXh0cmE9CmluICRjZmcsIHVzZSBvdXIgb3duLgoKU2lnbmVkLW9mZi1ieTogV2VpIExp dSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KQWNrZWQtYnk6IElhbiBKYWNrc29uIDxpYW4uamFja3Nv bkBldS5jaXRyaXguY29tPgotLS0KdjM6IGhhbmRsZSBzaXR1YXRpb24gd2hlbiBubyBleHRyYT0g aXMgaW4gJGNmZwotLS0KIHRzLWRlYmlhbi1maXh1cCB8IDYgKysrKystCiAxIGZpbGUgY2hhbmdl ZCwgNSBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvdHMtZGViaWFu LWZpeHVwIGIvdHMtZGViaWFuLWZpeHVwCmluZGV4IDNlNWNkYjk3Li40NzhkYzJhZiAxMDA3NTUK LS0tIGEvdHMtZGViaWFuLWZpeHVwCisrKyBiL3RzLWRlYmlhbi1maXh1cApAQCAtMTc4LDcgKzE3 OCwxMSBAQCBzdWIgb3RoZXJmaXh1cGNmZyAoKSB7CiAgICAgICAgICRleHRyYSAuPSAiIGlvbW11 PXNvZnQiOwogICAgIH0KIAotICAgICRjZmcgLj0gIlxuZXh0cmE9JyRleHRyYSdcbiI7CisgICAg aWYgKCRjZmcgPX4gbS9leHRyYVxzKj1ccypbJyJdKC4qKVsnIl0vKSB7CisJJGNmZyA9fiBzL2V4 dHJhXHMqPVxzKlsnIl0oLiopWyciXS9leHRyYSA9ICckMSAkZXh0cmEnLzsKKyAgICB9IGVsc2Ug eworCSRjZmcgLj0gImV4dHJhID0gJyRleHRyYSdcbiI7CisgICAgfQogfTsKIAogc3ViIHdyaXRl Y2ZnICgpIHsKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnBy b2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94 ZW4tZGV2ZWw=