From: Reggie Burnett
Date: September 4 2012 8:04pm
Subject: bzr commit into ABSv2 branch (reggie.burnett:18)
List-Archive: http://lists.mysql.com/commits/144691
Message-Id: <201209042004.q84K4CBL009566@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2078536755=="

--===============2078536755==
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

   18 Reggie Burnett	2012-09-04
      we are now passing to manifestupdater the manifest version we want it to use

    modified:
      AbsUtility/Job.cs
=== modified file 'AbsUtility/Job.cs'
=== modified file 'AbsUtility/Job.cs'
--- a/AbsUtility/Job.cs	2012-09-01 00:15:37 +0000
+++ b/AbsUtility/Job.cs	2012-09-04 20:04:05 +0000
@@ -297,7 +297,7 @@
       string dir = GetCacheDirs(series, license);
       ProcessStartInfo pi = new ProcessStartInfo();
       pi.FileName = Path.Combine(Settings.ToolsFolder, "ManifestUpdater.exe");
-      string args = "--in=manifest-base.xml --out=products.xml --wait=n";
+      string args = String.Format("--in=manifest-base.xml --out=products.xml --wait=n --mv={0}", GetNextManifestVersion());
       args += String.Format(" --um=\"{0}\"", Path.Combine(Settings.ToolsFolder, "mysql-installer-update-1.1.4.0.msi"));
       args += String.Format(" --cache=\"{0}\"", dir);
       pi.Arguments = args;
@@ -309,6 +309,15 @@
         throw new Exception("Manifest generation failed");
     }
 
+    private int GetNextManifestVersion()
+    {
+      // get the latest manifest version
+      object mv = MySqlHelper.ExecuteScalar(Settings.ConnectionString, "SELECT manifest_version FROM abs_jobs WHERE status IN ('P', 'R') ORDER BY complete_date DESC LIMIT 1");
+      if (mv == null) throw new Exception("Unable to get latest manifest version from db");
+      int manifestVersion = (int)mv;
+      return manifestVersion+1;
+    }
+
     private string GetCacheDirs(string series, string license)
     {
       StringBuilder cacheDir = new StringBuilder(BuildDir);


--===============2078536755==
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\
#   49efr92ekhl0wpyp
# target_branch: file:///C:/work/wex/absv2/
# testament_sha1: c0efba48001284721f423432cd524f8b4f8f4211
# timestamp: 2012-09-04 15:04:05 -0500
# base_revision_id: reggie.burnett@stripped\
#   iycg1uq25cxkr2oj
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb52Lt4AAdPfgFASUO///1/3
36C////6UAReiBjuOUADsNNImTUyTxMqZgpmp+qNp6U2pptJ6nhRtTBMbUIBlBJ5DCZCnqAAAAAA
AAAA1U/Sj1P0oaBoDIAAaA0aaAAAADjJk0YhiaYCBgTTBGCYmmmgAwgkkEZBDQaNAmKZRsE1PSZl
DEaaBoab1SCC/aUHy0/sZ8I62SesLoYkGDpvodrfbtdzm/mx/DZUgRyAYB0V3f1H+xh3VkEhvelr
Y9iqaSApiZE719Dt8B7ROvP6b18s2w8e61lv9u2aN7pyUJivuZhpdP7NaR+CHNpfQ2BRkmUVZsef
Hx22dVQceZioMngxs8ykVKksX2yrw8QhDifAmvofZedHERDvF42WN5eKb/W3qp26dl+XoQjcpOj1
eWffdTTBWMMx+PF2U3PgLwKPR7IIUXQ0VSugKIiQnEkKQ9Mp6is5/SVGC5C8oXKLJm4P9/eUjcqL
HwoQnjGbPmU6oYl+hhVPgXrV8H6lwznwskS8y6/kLRWKxCrQppjKse4h1LALpyDHPzxi6DFJSkpl
Y0RuiRoo25CKZ/VuIE6NOCp3SM1+2wVCZBlcOioV2toTWEwWigTvLMV1YKGSFlaDKvik85RjUqV6
nlk8ivCJXiCRGJskH0PE4FQUHUU0mACFQLC1sQtQemtxqoN0HKe104yEXQQQLkgXgqE6gsW2vDlg
460tTbY9YrehJrvQlDwiAND4KANRG0ZCToC4GFqUJiitE/QkKrXLuOIILkpQiHUd616Gl3m7v8S5
5JHrkez80Sst3zhiqJmanFy+edYXtmrDcu9j+ABvzgwv2qAdbU5VA56x0c/02CS7wVa40QTaJ2Ab
pNWuWl1iDkBSOyuiZAV0scmfOYgyTE3cmlevQq1E8omz2U7p3bHOXcI+5HsJrfxx+P159a6OFrMk
WpGPc5WE2/BNiMnTgV2KC0Oevrwt0mqm7EqCWobdx4O9J8mNiCBUQXjj/1mG+zJyVczM2V9ygqol
eBRyy4q82CaSmeM7OwXrwEWQFsnybH83HnI7kyuvnLB+rLLmyZU79lJSgc2s/4250jtyId8yanVe
cOs/PltjkNEgX07ezGxZtE5zw1rYu/pRQUpFXStaRpqdNk28NJb8Rdr8gWOKirx9SaxIj+8RGYsv
UVlliC2zGxRRX5l9cpIpYTN0hK/fxsxKl/gb2/Tw06zATg9SsJ+Aoh6FYEHh8shccMlqQ462j9+l
p1W5gVa/VgvCeFZlzEoxHU7PlhCupyrYBzHOVUA5RoSIwFKgRGEHsZEMye5cd65+05NWdibWhSEu
z3wOaRUFfxY3vV2WnN7kbM2tmTb3kN831x57J4Wr3C9ypXt3UMy702cTYkl1RrXadozu+COL/TpI
Vd2xX2hcCe/HF3XSgpCXhO70J9b27pU041qto6AOkHzXhVUwLLUGd7rSNPEjYOyPsgqIuZz8dIju
KSkKXjlSOoi+hiw4snZrqcRToxSVgWpto6FKS8kRRiQ9UxRg5nAU9twITCcGaQRI3KEHluCBIDpM
gwN4T8AmjuE6aRBBgpPGe2hKgk7cTRlhZYZ/+LuSKcKEhfOxdvA=


--===============2078536755==--