You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2013/05/28 02:00:59 UTC
[1/2] git commit: [flex-sdk] [refs/heads/develop] - Boundary can be
on separate line
Updated Branches:
refs/heads/develop ae21a371e -> 9ab1de703
Boundary can be on separate line
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/4b0077be
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/4b0077be
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/4b0077be
Branch: refs/heads/develop
Commit: 4b0077be251ce6246090bf85810ad1d98c65c0dc
Parents: ae21a37
Author: Alex Harui <ah...@apache.org>
Authored: Tue May 28 00:58:42 2013 +0100
Committer: Alex Harui <ah...@apache.org>
Committed: Tue May 28 00:58:42 2013 +0100
----------------------------------------------------------------------
.../PatchExtractor/src/PatchExtractor.mxml | 28 ++++++++++++--
1 files changed, 24 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b0077be/mustella/utilities/PatchExtractor/src/PatchExtractor.mxml
----------------------------------------------------------------------
diff --git a/mustella/utilities/PatchExtractor/src/PatchExtractor.mxml b/mustella/utilities/PatchExtractor/src/PatchExtractor.mxml
index 53bf2d6..eba1a93 100644
--- a/mustella/utilities/PatchExtractor/src/PatchExtractor.mxml
+++ b/mustella/utilities/PatchExtractor/src/PatchExtractor.mxml
@@ -91,6 +91,7 @@ limitations under the License.
private var PART_MODE:int = 5;
private var ATTACHMENT_MODE:int = 6;
private var PART_TYPE_MODE:int = 7;
+ private var BOUNDARY_SEARCH_MODE:int = 8;
private function computePatches():void
{
@@ -142,10 +143,17 @@ limitations under the License.
|| line.indexOf("Content-Type: multipart/mixed") == 0)
{
c = line.indexOf("boundary=");
- partDelimiter = line.substr(c + 9);
- if (partDelimiter.charAt(0) == '"')
- partDelimiter = partDelimiter.substr(1, partDelimiter.length - 2);
- mode = PART_SEARCH_MODE;
+ if (c == -1)
+ {
+ mode= BOUNDARY_SEARCH_MODE;
+ }
+ else
+ {
+ partDelimiter = line.substr(c + 9);
+ if (partDelimiter.charAt(0) == '"')
+ partDelimiter = partDelimiter.substr(1, partDelimiter.length - 2);
+ mode = PART_SEARCH_MODE;
+ }
break;
}
break;
@@ -181,6 +189,18 @@ limitations under the License.
}
break;
}
+ case BOUNDARY_SEARCH_MODE:
+ {
+ c = line.indexOf("boundary");
+ if (c != -1)
+ {
+ partDelimiter = line.substr(c + 9);
+ if (partDelimiter.charAt(0) == '"')
+ partDelimiter = partDelimiter.substr(1, partDelimiter.length - 2);
+ mode = PART_SEARCH_MODE;
+ }
+ break;
+ }
case PART_MODE:
{
if (line.indexOf("--" + partDelimiter) == 0)
[2/2] git commit: [flex-sdk] [refs/heads/develop] - Try for loop to
test for existence of patches
Posted by ah...@apache.org.
Try for loop to test for existence of patches
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/9ab1de70
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/9ab1de70
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/9ab1de70
Branch: refs/heads/develop
Commit: 9ab1de703e6183eaba64fa26f38afa67b916d6c3
Parents: 4b0077b
Author: Alex Harui <ah...@apache.org>
Authored: Tue May 28 00:59:35 2013 +0100
Committer: Alex Harui <ah...@apache.org>
Committed: Tue May 28 00:59:35 2013 +0100
----------------------------------------------------------------------
test_patch_by_email.sh | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9ab1de70/test_patch_by_email.sh
----------------------------------------------------------------------
diff --git a/test_patch_by_email.sh b/test_patch_by_email.sh
index a1fc765..0340f67 100644
--- a/test_patch_by_email.sh
+++ b/test_patch_by_email.sh
@@ -29,14 +29,18 @@ then
cd mustella/utilities/PatchExtractor/src
echo "launching patch extractor"
"$AIR_HOME/bin/adl" -runtime "$AIR_HOME/runtimes/air/win" PatchExtractor-app.xml -- c:/cygwin/var/spool/mail/mustellarunner
-rc=$?
-if [[ $rc != 0 ]] ; then
- cd ../../../..
+cd ../../../..
+gotone=0
+for (file in *.patch)
+do
+ git pull --rebase
+ gotone=1
+ break;
+done
+if [ gotone == 0 ] ; then
echo "no patches"
- exit $rc
+ exit 2
fi
-cd ../../../..
-git pull --rebase
for file in *.patch
do