Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2010-11-21 20:53:41 -0500
committerPascal Rapicault2010-11-21 20:53:41 -0500
commit05637c6c2620c332aa1e709d5f6b19d558e1d9fc (patch)
treeed0ef20a2b2129ef71c0b12a039c8916af2f97ea /bundles/org.eclipse.equinox.p2.repository
parent34875a9e7539283136c10f2280929dc032e70a68 (diff)
downloadrt.equinox.p2-05637c6c2620c332aa1e709d5f6b19d558e1d9fc.tar.gz
rt.equinox.p2-05637c6c2620c332aa1e709d5f6b19d558e1d9fc.tar.xz
rt.equinox.p2-05637c6c2620c332aa1e709d5f6b19d558e1d9fc.zip
Bug 330441 - error checking cachev20101122
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.repository')
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManager.java1
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Messages.java1
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/messages.properties1
3 files changed, 3 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManager.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManager.java
index a772bee3d..802cd6dee 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManager.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManager.java
@@ -350,6 +350,7 @@ public class CacheManager {
safeDelete(cacheFile);
if (tempFile.renameTo(cacheFile))
return;
+ result = new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.CacheManage_ErrorRenamingCache, new Object[] {remoteFile.toString(), tempFile.getAbsolutePath(), cacheFile.getAbsolutePath()}));
}
if (result.getSeverity() == IStatus.CANCEL || submonitor.isCanceled())
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Messages.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Messages.java
index 4cd929b65..61d8912b8 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Messages.java
@@ -20,6 +20,7 @@ public class Messages extends NLS {
public static String CacheManager_AuthenticationFaileFor_0;
public static String CacheManager_FailedCommunicationWithRepo_0;
public static String CacheManager_Neither_0_nor_1_found;
+ public static String CacheManage_ErrorRenamingCache;
public static String artifact_not_found;
public static String io_failedRead;
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/messages.properties b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/messages.properties
index fdc13e015..4e59267be 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/messages.properties
@@ -22,6 +22,7 @@ repo_loading = Loading the repository {0}
CacheManager_Neither_0_nor_1_found=Neither {0} nor {1} found.
CacheManager_AuthenticationFaileFor_0=Authentication failed for {0}.
CacheManager_FailedCommunicationWithRepo_0=Communication with repository at {0} failed.
+CacheManage_ErrorRenamingCache=An error occurred while downloading {0}. The cache file {1} could not be renamed to {1}.
exception_malformedRepoURI = The repository location ({0}) must be a URI.

Back to the top