Bug 262073 Errors upgrading shared install with install dir containing spaces

2 files changed, 15 insertions, 1 deletions

diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AggregatedBundleRepository.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AggregatedBundleRepository.java
index 62383a230..0704fe917 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AggregatedBundleRepository.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/AggregatedBundleRepository.java
@@ -104,4 +104,12 @@ public class AggregatedBundleRepository extends AbstractArtifactRepository imple
 	public OutputStream getOutputStream(IArtifactDescriptor descriptor) {
 		throw new UnsupportedOperationException(Messages.artifact_write_unsupported);
 	}
+
+	/**
+	 * Exposed for testing and debugging purposes.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public Collection testGetBundleRepositories() {
+		return bundleRepositories;
+	}
 }
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java
index b876cf9d3..81212bca7 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java
@@ -132,7 +132,13 @@ public class Util {
 			for (Iterator iterator = repos.iterator(); iterator.hasNext();) {
 				try {
 					String repo = (String) iterator.next();
-					URI repoLocation = new URI(repo);
+					URI repoLocation;
+					try {
+						repoLocation = new URI(repo);
+					} catch (URISyntaxException e) {
+						//in 1.0 we wrote unencoded URL strings, so try as an unencoded string
+						repoLocation = URIUtil.fromString(repo);
+					}
 					IArtifactRepository repository = manager.loadRepository(repoLocation, null);
 					if (repository != null && repository instanceof IFileArtifactRepository && !bundleRepositories.contains(repository))
 						bundleRepositories.add(repository);