From: Reggie Burnett
Date: September 17 2012 10:40pm
Subject: bzr commit into ABSv2 branch (reggie.burnett:39)
List-Archive: http://lists.mysql.com/commits/144790
Message-Id: <201209172240.q8HMejIh022719@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1631530306=="

--===============1631530306==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///C:/work/wex/absv2/ based on revid:reggie.burnett@stripped

   39 Reggie Burnett	2012-09-17
      small correction in how we validate a product file

    modified:
      AbsUtility/ProductFile.cs
=== modified file 'AbsUtility/ProductFile.cs'
=== modified file 'AbsUtility/ProductFile.cs'
--- a/AbsUtility/ProductFile.cs	2012-09-17 22:01:12 +0000
+++ b/AbsUtility/ProductFile.cs	2012-09-17 22:40:37 +0000
@@ -52,12 +52,16 @@
         throw new Exception("Every product file requires a regular expression");
       if (Generated && String.IsNullOrEmpty(GenerationScript))
         throw new Exception("Generated files require a supplied generation script");
+      File = null;
       string[] files = Utility.MatchFiles(Product.IncomingFolder, RegularExpression);
-      if (files.Length != 1 && checkGenerated)
+      if (files != null && files.Length == 1)
+      {
+        File = files[0];
+        if (Utility.FileIsLocked(File))
+          throw new Exception(String.Format("File matching expression {0} is still locked", RegularExpression));
+      }
+      else if (checkGenerated)
         throw new Exception("Regular expression did not match exactly 1 file");
-      File = files[0];
-      if (Utility.FileIsLocked(File))
-        throw new Exception(String.Format("File matching expression {0} is still locked", RegularExpression));
     }
 
     public bool Build(Version newVersion)


--===============1631530306==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/reggie.burnett@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: reggie.burnett@stripped\
#   pkzu85xs2rrqtiau
# target_branch: file:///C:/work/wex/absv2/
# testament_sha1: 3fa52a947f619d1fa9ec11f177d8a7b48be9542c
# timestamp: 2012-09-17 17:40:37 -0500
# base_revision_id: reggie.burnett@stripped\
#   uxb76n4e12p735ug
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTpy61cAAatfgBUScWf//1Ok
Wgq////6UAPab2u4uMrtddNuEokNNAhkaZNNKe1Rsp+mplG0mgPTSepptJoJKEANGhHpE9DSBNPU
aZNABoAAaCE0U/U8lPKeofqamgaAeoAAABp6hzTEyZNGEwTE0wCYBDBGBGASRCAKep6m0TNRMwkw
jAIYRkZGg0AXZhQPO35E0DEMggdXfkIMMDLlCK5i35n4mmJpkARoHnz/CS1/a5RVT9+KbJ/6125W
ZlKVGK555vI5r12sn8mN2zdP9Q3ozVG/nmiOr3RSxRrYrbq4c9eyufGPb2CUyRme4HufxhM2/Iz2
Yn5Efui3fE7BRp8OK2yyaPwSQ8zY3TyiBZlfd123CUtivFF75ADxUlH8zlZRKktpMt/GXEAxbPDY
e63FMPP4n0EUoZmvoB7tJNqfc6yR6MrhDn0wtObbLNWFRqlVShO6YFW9lAZWFhMSFlxhGCAMqkGa
KH/ryzgv4QUqRMbCzrJQbATqbL5u2bw2DKMoAWrG55HF0pRxK3EDio1loXy479GxWagPdkGeuo7G
DzBYbodNitFPJrkcxuNzb21MljMQL2Ks/pYqaaUsHCM0x1803MFlligJ5LrNWp65xhiHWLCFZB2S
TwCrqTUpVwgsUuCiQjYco0QJ9h0RQMQjMg5HxXA2FZcPXvKPkv6XhOZ8a+9YNfL5uRB0iop5QvLt
5co/CK8viZwb3SOH9MTqFB/g+QsC4tPaWXChEJNcOE0AcOOieeDd8JkGhqgY4TDfNUdyTvT5cRYi
GsTdoFRpD2z1wLtflhw2XOo+Q5IgkX6NVZMwYGG6btq1lqmTHB5LJo7iW5G8be17PcyRIYhTnq7l
BtTO83lvTN1dEZyDXlQbal2XfEdXFFkjWOs6yIgtlsVS082GGo8/SQ3oqUqX2RukOfhkuO+UZMCa
DOqhSSrZmMMR8Y8gbmaFJ9+u05GPK9ziHLeE2kNcCv1gpoYYxvfQFblk3z2wpgVqIsn59k0sxAje
MnZmPQsVFVUGpSo03BkwyWac8DqmZGmrYD4EW6THeGDOGwUlvBz0BCANhqRQkGANswamlaiVFDeI
iFNxOOm1wz2PbUHBwYCngSCqeQQnqBSioaWQ7KA6ot5Z0Tl4KYDliftIxCnRhPlIrZ+GK5KGpjE4
fPcKrKs3FPs7q408Gmu8XebYprkl2wlSFZWM+uhExeEeG4jq3LQyAno92JNnuFPnFS4Nk0J90Xu9
mt9O5ixdIqB51ySoDI6NBmdFMDUiCrIQaENrxHDQ2zoBXTxhWJTUCslGKPMrQUU9HQKKG8ltxoOt
/w5khsyZDZOrURHeBkZL46ELMgjEptVVtzVEF3ETvxrh/xdyRThQkDpy61c=


--===============1631530306==--