public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Fix typo from commit 0c5e67e4 "xfstests 273: fix a typo"
       [not found] <20130307124102.821208303@sgi.com>
@ 2013-03-07 12:41 ` rjohnston
  2013-03-07 14:56   ` Mark Tinguely
  0 siblings, 1 reply; 3+ messages in thread
From: rjohnston @ 2013-03-07 12:41 UTC (permalink / raw)
  To: xfs; +Cc: shhuiw

[-- Attachment #1: fix-typo-273.patch --]
[-- Type: text/plain, Size: 693 bytes --]

When updating the patch, the redirect was incorrect.

Reported-by: Wang Sheng-Hui <shhuiw@gmail.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>

---

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

Index: b/273
===================================================================
--- a/273
+++ b/273
@@ -92,7 +92,7 @@ _porter()
 		exit
 	fi
 
-	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 ]
 	then
 		echo "_porter $_suffix not complete"


_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Fix typo from commit 0c5e67e4 "xfstests 273: fix a typo"
  2013-03-07 12:41 ` [PATCH] Fix typo from commit 0c5e67e4 "xfstests 273: fix a typo" rjohnston
@ 2013-03-07 14:56   ` Mark Tinguely
  2013-03-07 15:48     ` Rich Johnston
  0 siblings, 1 reply; 3+ messages in thread
From: Mark Tinguely @ 2013-03-07 14:56 UTC (permalink / raw)
  To: rjohnston; +Cc: shhuiw, xfs

On 03/07/13 06:41, rjohnston@sgi.com wrote:
> When updating the patch, the redirect was incorrect.
>
> Reported-by: Wang Sheng-Hui<shhuiw@gmail.com>
> Signed-off-by: Rich Johnston<rjohnston@sgi.com>
>
> ---
>
>   273 |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: b/273
> ===================================================================
> --- a/273
> +++ b/273
> @@ -92,7 +92,7 @@ _porter()
>   		exit
>   	fi
>
> -	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 ]
>   	then
>   		echo "_porter $_suffix not complete"
>


The original patch looked okay:

    http://oss.sgi.com/archives/xfs/2013-02/msg00518.html

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

--Mark.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Fix typo from commit 0c5e67e4 "xfstests 273: fix a typo"
  2013-03-07 14:56   ` Mark Tinguely
@ 2013-03-07 15:48     ` Rich Johnston
  0 siblings, 0 replies; 3+ messages in thread
From: Rich Johnston @ 2013-03-07 15:48 UTC (permalink / raw)
  To: Mark Tinguely; +Cc: shhuiw, dsterba, xfs

On 03/07/2013 08:56 AM, Mark Tinguely wrote:
> On 03/07/13 06:41, rjohnston@sgi.com wrote:
>> When updating the patch, the redirect was incorrect.
>>
>> Reported-by: Wang Sheng-Hui<shhuiw@gmail.com>
>> Signed-off-by: Rich Johnston<rjohnston@sgi.com>
>>
>> ---
>>
>>   273 |    2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> Index: b/273
>> ===================================================================
>> --- a/273
>> +++ b/273
>> @@ -92,7 +92,7 @@ _porter()
>>           exit
>>       fi
>>
>> -    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 ]
>>       then
>>           echo "_porter $_suffix not complete"
>>
>
>
> The original patch looked okay:
>
>     http://oss.sgi.com/archives/xfs/2013-02/msg00518.html
>
> Should the bad patch be reverted and the original one put in?
>
> --Mark.
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@gmail.com>
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@gmail.com>
     Reviewed-by: Dave Chinner <dchinner@redhat.com>
     Signed-off-by: Rich Johnston <rjohnston@sgi.com>

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

-       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 ]
         then
                 echo "_porter $_suffix not complete"

commit 2a599a54aba600c299b8209d802f97c51a164dcb
Author: Rich Johnston <rjohnston@sgi.com>
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.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-03-07 15:48 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20130307124102.821208303@sgi.com>
2013-03-07 12:41 ` [PATCH] Fix typo from commit 0c5e67e4 "xfstests 273: fix a typo" rjohnston
2013-03-07 14:56   ` Mark Tinguely
2013-03-07 15:48     ` Rich Johnston

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox