[oe-commits] Koen Kooi : patchword apply helper: use git-am -s and remove file when done

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 8f6996cef591593fc5347d7643f651cf50d20e89
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8f6996cef591593fc5347d7643f651cf50d20e89

Author: Koen Kooi <koen at openembedded.org>
Date:   Thu Apr 23 08:35:57 2009 +0200

patchword apply helper: use git-am -s and remove file when done

---

 contrib/angstrom/upload-packages.sh |    2 +-
 contrib/patchwork/pw-am.sh          |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh
index 1ae7086..37d8c9a 100644
--- a/contrib/angstrom/upload-packages.sh
+++ b/contrib/angstrom/upload-packages.sh
@@ -32,7 +32,7 @@ cat files-remote files-local | sort | uniq -u >files-uniq
 cat files-uniq files-local | sort | uniq -d > files-trans
 
 # Remove SGX files
-rm -f upload-queue/*3.00.*
+rm -f upload-queue/ti*codec* upload-queue/*3.00.*
 
 # Copy over non-duplicate files
 echo "Starting rsync..."
diff --git a/contrib/patchwork/pw-am.sh b/contrib/patchwork/pw-am.sh
index 2ce6dc4..1c64aa5 100755
--- a/contrib/patchwork/pw-am.sh
+++ b/contrib/patchwork/pw-am.sh
@@ -10,5 +10,6 @@
 for patchnumber in $@;
 do
 	wget -nv http://patchwork.openembedded.org/patch/$patchnumber/mbox/ -O pw-am-$patchnumber.patch
-	git am pw-am-$patchnumber.patch
+	git am -s pw-am-$patchnumber.patch
+	rm pw-am-$patchnumber.patch
 done