diff options
author | DJ Houghton | 2010-12-08 16:46:33 +0000 |
---|---|---|
committer | DJ Houghton | 2010-12-08 16:46:33 +0000 |
commit | d2191486429be80984dd6be9cbf9d6808a86da98 (patch) | |
tree | fee747323fa75f5ec0b09e9d4989320557e67c93 | |
parent | d12258b290c6e8f64aa786e6d6080f16ec5dd6a6 (diff) | |
download | rt.equinox.p2-R3_6_1_maintenance_patches.tar.gz rt.equinox.p2-R3_6_1_maintenance_patches.tar.xz rt.equinox.p2-R3_6_1_maintenance_patches.zip |
Bug 332148 - [native] Only log BackupStore error messages for shared installs when in debug modeR36x_v20101208-1130R3_6_1_maintenance_patches
2 files changed, 5 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF index 03fbcd48d..98ee2c4cd 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.touchpoint.natives;singleton:=true -Bundle-Version: 1.0.200.qualifier +Bundle-Version: 1.0.201.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.touchpoint.natives.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/actions/RmdirAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/actions/RmdirAction.java index 8473a2ae8..410bf1b27 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/actions/RmdirAction.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/actions/RmdirAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 IBM Corporation and others. + * Copyright (c) 2008, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -36,13 +36,11 @@ public class RmdirAction extends ProvisioningAction { try { store.backupDirectory(dir); } catch (IOException e) { - return new Status(IStatus.ERROR, Activator.ID, IStatus.OK, NLS.bind(Messages.rmdir_failed, path, ID), e); + // Only return a warning here, not an error. See Bug 331609 for more detail. + return new Status(IStatus.WARNING, Activator.ID, IStatus.OK, NLS.bind(Messages.rmdir_failed, path, ID), e); } catch (IllegalArgumentException e) { // Ignore the delete/backup if the directory was not empty as this preserves the - // the original semantics. - // See Bug 272312 for more detail. - // return new Status(IStatus.ERROR, Activator.ID, IStatus.OK, NLS.bind(Messages.rmdir_failed, ActionConstants.PARM_PATH, ID), e); - // + // the original semantics. See Bug 272312 for more detail. } else dir.delete(); |