Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: Re: ✗ patchtest: failure for Python3 packaging fixes
Date: Mon, 30 Jan 2017 09:06:56 -0600	[thread overview]
Message-ID: <04ba7ca8-b4ad-9ccb-656d-654da5c710b4@linux.intel.com> (raw)
In-Reply-To: <20170127094032.zpdy3uaohktwcgqk@ad.chargestorm.se>



On 01/27/2017 03:40 AM, Anders Darander wrote:
> Hi,
>
> * Patchwork <patchwork@patchwork.openembedded.org> [170127 10:23]:
>
>> Series: Python3 packaging fixes
>> Revision: 1
>> URL   : https://patchwork.openembedded.org/series/5024/
>> State : failure
>> * Issue             Series does not apply on top of target branch [test_series_merge_on_head]
>>    Suggested fix    Rebase your series on top of targeted branch
>>    Targeted branch  master (currently at a99cca0e8e)
> This is likely due to issues with the email-patches. One of the patches,
> 0003, has a line > 998 characters (one line in the patch context, ie not
> modified by me).

Anders, I do not think the problem is the patch format because git-am 
does not complain at this stage. This is what I am getting when either 
git-am or git-apply

git pw mbox 5024 | git am
Applying: python-3-manifest: fix adding imp to importlib
Applying: python3-manifest: move htlm.py to python3-html
Applying: python-3-manifest: add argparse to RDEPENDS for netclient
error: patch failed: 
meta/recipes-devtools/python/python-3.5-manifest.inc:154
error: meta/recipes-devtools/python/python-3.5-manifest.inc: patch does 
not apply
Patch failed at 0003 python-3-manifest: add argparse to RDEPENDS for 
netclient
The copy of the patch that failed is found in:
    /home/lsandov1/repos/openembedded-core/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
lsandov1@lsandov1-mobl2:~/repos/openembedded-core$ git am --abort

lsandov1@lsandov1-mobl2:~/repos/openembedded-core$ git pw mbox 5024 | 
git apply --check
error: patch failed: 
meta/recipes-devtools/python/python-3.5-manifest.inc:154
error: meta/recipes-devtools/python/python-3.5-manifest.inc: patch does 
not apply
error: patch failed: 
meta/recipes-devtools/python/python-3.5-manifest.inc:119
error: meta/recipes-devtools/python/python-3.5-manifest.inc: patch does 
not apply

Meaning that you may need to fix merge failures for the manifest.inc file.

In the other hand, bad formatted patches have their own (patch) test, 
and the report does not include it.


> Retrieving the patch series from the branch at github should work, as
> it's based on the current master, a99cca0e8e.
>
> Cheers,
> Anders
>



  reply	other threads:[~2017-01-30 14:59 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-27  9:05 [PATCH 0/7] Python3 packaging fixes Anders Darander
2017-01-27  9:05 ` [PATCH 1/7] python-3-manifest: fix adding imp to importlib Anders Darander
2017-01-27  9:05 ` [PATCH 2/7] python3-manifest: move htlm.py to python3-html Anders Darander
2017-01-27  9:05 ` [PATCH 3/7] python-3-manifest: add argparse to RDEPENDS for netclient Anders Darander
2017-01-27  9:05 ` [PATCH 4/7] python-3-manifest: add socketserver to netserver Anders Darander
2017-01-27  9:06 ` [PATCH 5/7] python-3-manifest: add _compat_pickle to python3-pickle Anders Darander
2017-01-27  9:06 ` [PATCH 6/7] python-3-manifest: add ipaddress to python3-io Anders Darander
2017-01-27  9:06 ` [PATCH 7/7] python-3-manifest: split out typing Anders Darander
2017-01-27  9:23 ` ✗ patchtest: failure for Python3 packaging fixes Patchwork
2017-01-27  9:40   ` Anders Darander
2017-01-30 15:06     ` Leonardo Sandoval [this message]
2017-01-31  7:09       ` Anders Darander

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=04ba7ca8-b4ad-9ccb-656d-654da5c710b4@linux.intel.com \
    --to=leonardo.sandoval.gonzalez@linux.intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox