[Top] [All Lists]

Re: [PATCH] Fix typo from commit 0c5e67e4 "xfstests 273: fix a typo"

To: Mark Tinguely <tinguely@xxxxxxx>
Subject: Re: [PATCH] Fix typo from commit 0c5e67e4 "xfstests 273: fix a typo"
From: Rich Johnston <rjohnston@xxxxxxx>
Date: Thu, 7 Mar 2013 09:48:51 -0600
Cc: <xfs@xxxxxxxxxxx>, <shhuiw@xxxxxxxxx>, <dsterba@xxxxxxx>, Dave Chinner <david@xxxxxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <5138AAA2.70308@xxxxxxx>
References: <20130307124102.821208303@xxxxxxx> <20130307124125.435047948@xxxxxxx> <5138AAA2.70308@xxxxxxx>
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0
On 03/07/2013 08:56 AM, Mark Tinguely wrote:
On 03/07/13 06:41, rjohnston@xxxxxxx wrote:
When updating the patch, the redirect was incorrect.

Reported-by: Wang Sheng-Hui<shhuiw@xxxxxxxxx>
Signed-off-by: Rich Johnston<rjohnston@xxxxxxx>


  273 |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Index: b/273
--- a/273
+++ b/273
@@ -92,7 +92,7 @@ _porter()

-    cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix>$seq.full 2>>&1
+    cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix>>$seq.full 2>&1
      if [ $? -ne 0 ]
          echo "_porter $_suffix not complete"

The original patch looked okay:


Should the bad patch be reverted and the original one put in?

Yes the patch would not apply to top of tree and I placed the redirect in the incorrect position when I updated the and committed the patch.

I have reverted and applied the patch correctly this time. :)

commit a1f6dd481218cd95c8d48ed684070cc2b0f62db2
Author: Wang Sheng-Hui <shhuiw@xxxxxxxxx>
Date:   Wed Feb 27 06:47:54 2013 +0000

    xfstests 273: fix a typo

Make the porter log cp failure into $seq.full by appending, not overwriting,
    which can help debug.

    Signed-off-by: Wang Sheng-Hui <shhuiw@xxxxxxxxx>
    Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>
    Signed-off-by: Rich Johnston <rjohnston@xxxxxxx>

diff --git a/273 b/273
index 67f3d6b..639e280 100755
--- a/273
+++ b/273
@@ -92,7 +92,7 @@ _porter()

-       cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >$seq.full 2>&1
+       cp -r $SCRATCH_MNT/origin $SCRATCH_MNT/sub_$_suffix >>$seq.full 2>&1
        if [ $? -ne 0 ]
                echo "_porter $_suffix not complete"

commit 2a599a54aba600c299b8209d802f97c51a164dcb
Author: Rich Johnston <rjohnston@xxxxxxx>
Date:   Thu Mar 7 09:21:30 2013 -0600

    Revert "xfstests 273: fix a typo"

    This reverts commit 0c5e67e46e476b70290033efc7feb784f7ecbab1.
    Will re-apply the correct patch.

<Prev in Thread] Current Thread [Next in Thread>