From: Reggie Burnett
Date: March 8 2010 9:29pm
Subject: bzr commit into connector-net-trunk branch (reggie.burnett:850)
 Bug#51407
List-Archive: http://lists.mysql.com/commits/102624
X-Bug: 51407
Message-Id: <0KYZ003SQFOY4TD0@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_WkUCSOYUcVZtGGwiT949Kg)"

--Boundary_(ID_WkUCSOYUcVZtGGwiT949Kg)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///D:/bzr-connector-net/trunk/ based on revid:reggie.burnett@stripped

  850 Reggie Burnett	2010-03-08
      - fixed installer problem when .NET 1.1 was present (bug #51407)

    modified:
      MySql.Data/Provider/Source/Installer.cs
      MySql.Web/Providers/Source/Install.cs
=== modified file 'MySql.Data/Provider/Source/Installer.cs'
=== modified file 'MySql.Data/Provider/Source/Installer.cs'
--- a/MySql.Data/Provider/Source/Installer.cs	2010-02-13 04:34:16 +0000
+++ b/MySql.Data/Provider/Source/Installer.cs	2010-03-08 21:29:19 +0000
@@ -75,6 +75,10 @@
             string[] dirs = Directory.GetDirectories(rootPath);
             foreach (string frameworkDir in dirs)
             {
+                string[] pathElements = frameworkDir.Split(Path.DirectorySeparatorChar);
+                if (pathElements[pathElements.Length - 1].StartsWith("v1")) continue;
+                if (pathElements[pathElements.Length - 1].StartsWith("v3")) continue;
+
                 string configPath = String.Format(@"{0}\CONFIG", frameworkDir);
                 if (Directory.Exists(configPath))
                 {

=== modified file 'MySql.Web/Providers/Source/Install.cs'
--- a/MySql.Web/Providers/Source/Install.cs	2010-02-13 04:34:16 +0000
+++ b/MySql.Web/Providers/Source/Install.cs	2010-03-08 21:29:19 +0000
@@ -93,6 +93,10 @@
             string[] dirs = Directory.GetDirectories(rootPath);
             foreach (string frameworkDir in dirs)
             {
+                string[] pathElements = frameworkDir.Split(Path.DirectorySeparatorChar);
+                if (pathElements[pathElements.Length-1].StartsWith("v1")) continue;
+                if (pathElements[pathElements.Length - 1].StartsWith("v3")) continue;
+
                 string configPath = String.Format(@"{0}\CONFIG", frameworkDir);
                 if (Directory.Exists(configPath))
                 {


--Boundary_(ID_WkUCSOYUcVZtGGwiT949Kg)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/reggie.burnett@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/reggie.burnett@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: reggie.burnett@stripped
# target_branch: file:///D:/bzr-connector-net/trunk/
# testament_sha1: c9697a0ba632b196e001f1e64108d94e1628c994
# timestamp: 2010-03-08 15:29:20 -0600
# source_branch: file:///D:/bzr-connector-net/6.2/
# base_revision_id: reggie.burnett@stripped\
#   1pixm1qu5fk4e63k
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT52pF0AAnffgAAWW2P//18n
XIq////wUAUZeDQEVFACqhqpskDIGm1NAYmmQyNMQaDE0yaYhzTEyZNGEwTE0wCYBDBGBGASJCTK
n6mKe0noUepp5EHqbKaNPUNqDT1BkaHNMTJk0YTBMTTAJgEMEYEYBJICABNJiMlP2iaU8hN6jSBp
oAwnLy5dKqO39DM0hUKK9NWPyWXVzoCzlOST0E3jFM0igQQLs/Zh4B9FxzLgahptuX2Vc697I6Na
zxgDzHAxCBPSIr+cAgRkSqbEgLYL9IIgiUozHAA0zC95fHUGBLPmR3u3ci0zBQ22vEeQcrQgL+F/
Kw7GGM58g5DhYcA2hM+6K6UbVtK0Kh4sBVi1CnyA7Hu/tQMQtvO8IqoS5CToMw24kuoR0mPgkWWC
dlchcUKKFjwR2DtB6RnI7hiKo5CrRJvw+Y6xCjdSt3VpM8DDw8Ls3kR47BeimURJUqZfSdtoh2qr
YywwnswCotaZRXwhVGgzJF5OiuGmXkYjNAUi2AGYyOokegqR5uMy2ncbFIvSMQtlgfUCZ/oFBatd
BVQytFVMISLjUQW8oMxYiuUgrVYx5qZXcxvoHHo4wNl5zCg3F5k0cjA3jH0V1tTF9C/KwzKyMM1h
SUTLBxVaXLsCwUhTGJOiZ1lRKQoGN2jZmlUyR3CvH3hgZl5MC8pjSJ9dyRWOdaxIpMTMDVLO+dit
NRWOAuGWEgM6BNkBcYidkZYNYQpH2LEXsISV8QvDAJtWIpQWU3MftHvPM0upmMqvO+KzHMlDNjiW
0Zp5lt6pYIKoiWRcytEsVTabf1x4jWrhlOPWIziR9zEx1BAnvIFK4gUyBMORrIHYMO4zhlkza0yG
jdVFLWPExvGPA0F9vEePOFlZuR6WJYlIh7MRWImHh8VxX8KCKzbYYV0nWLcC4atfnEuaXkUlRvN4
HecxesUiRiLr290GtEvJDCmGoV/EsLioIA2AqktY4XmJ6tZcTcvaBth7iIu0TxJ568DA6ieuh3Lt
LBxuDV4nJeZ20nRryCPH6Ko5znM3ylqJ97EvEkWdwbpnBeMUDBh/TQV9CabPOl64h3lNS2JJyBxN
DQDPYczcVGsXn+fE6HIcUrQsXyPvPUprI1PRXe88ksklzSX+wDWB2Ac2BNuF/xX78gMUTwKvqloK
5JRPmG9XgbRQNeiLLB/uiG6MNSD4Bcg5nqC23mpkawNvsbWKabAgPOh2I+wqVUG0XX9BEAuOIGnG
GnvEuqxU1AR+2+2A3rA2Abao+CpnC4SYDgpQQ+xJOUg+E0vqoMoKQMnsAMlu5gUHBJQQdzgei9Lx
JrY9FXtFIWWNoxr15g8+IdAmqg6qst12FJZYNEkKa2TBjMcKpLE4RLBSOPzyPcxcOBiYF1/liRZP
5GFewxRekqnwcHxFJHwAtCh5NKEaSCcB5VIKMbQWkZAtWVAygaShsSckew/wSdKNlJ7fF5ESieIP
VoHeD47AnQqQagFdkKi0IAoBQtRMuHA8IuMAYAYNhikq3nqXSIaHHSsSmk2AvlES0ChQFYgyGOB6
wMYSRbmbZ4Cd9EynSB/xdyRThQkD52pF0A==


--Boundary_(ID_WkUCSOYUcVZtGGwiT949Kg)--