Skip to contentSkip to conversation

Fix typo from commit 0c5e67e4 "xfstests 273: fix a typo"

PATCH In review [email protected] 2 participants 3 messages Mar 7, 2013 1 message not in the archive

lore
Share & tools
lore
#1 lore raw

PATCH 1/1 Fix typo from commit 0c5e67e4 "xfstests 273: fix a typo"

In reply to a message not in the archive

When updating the patch, the redirect was incorrect.

---

 273 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
273 +1 -1
Index: 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
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#2 lore raw
Quoted 16 lines · On 03/07/13 06:41, [email protected] wrote:

When updating the patch, the redirect was incorrect.

---

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

Index: b/273
===================================================================

273 _porter() · line 98

Quoted 8 lines
273 +1 -1
@@ -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
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

author Reviewed-by Dave Chinner
#3 lore raw
Quoted 29 lines · Mark Tinguely
Quoted 16 lines · On 03/07/13 06:41, [email protected] wrote:

When updating the patch, the redirect was incorrect.

---

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

Index: b/273
===================================================================

273 _porter() · line 98

Quoted 8 lines
273 +1 -1
@@ -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:

Quoted 5 lines
    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 <[email protected]>
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.

273 +1 -1
index 67f3d6b..639e280 100755
@@ -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 <[email protected]>
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
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs