diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.touchpoint.natives/src')
3 files changed, 8 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/BackupStore.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/BackupStore.java index 14cde8ab4..3bd9b5fc5 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/BackupStore.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/BackupStore.java @@ -563,6 +563,12 @@ public class BackupStore implements IBackupStore { File buRoot = new File(backupRoot, backupName); if (!fullyDelete(buRoot)) logWarning(NLS.bind(Messages.BackupStore_can_not_remove_bu_directory, buRoot.getAbsolutePath())); + for (String newName : renamedInPlace.values()) { + File buFile = new File(newName); + if (!fullyDelete(buFile)) { + logWarning(NLS.bind(Messages.BackupStore_can_not_remove_bu_file, buRoot.getAbsolutePath())); + } + } } private static void logWarning(String message) { diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java index 1dc2c6d53..87e0a837e 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/Messages.java @@ -34,6 +34,7 @@ public class Messages extends NLS { public static String BackupStore_can_not_delete_tmp_file; public static String BackupStore_can_not_remove; public static String BackupStore_can_not_remove_bu_directory; + public static String BackupStore_can_not_remove_bu_file; public static String BackupStore_directory_file_mismatch; public static String BackupStore_directory_not_empty; public static String BackupStore_errors_while_restoring_see_log; diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties index 963454d59..b5885bc36 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties +++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/messages.properties @@ -23,6 +23,7 @@ BackupStore_can_not_delete_after_copy_0=File that was copied to backup could not BackupStore_can_not_delete_tmp_file=Can not delete temporary file - it is safe to delete it manually: {0} BackupStore_can_not_remove=Can not remove : {0} BackupStore_can_not_remove_bu_directory=Could not remove temporary backup directory (it is safe to manually delete it and its contents): {0} +BackupStore_can_not_remove_bu_file=Could not remove temporary backup file (it is safe to manually delete it): {0} BackupStore_directory_file_mismatch=File already backed up as a directory: {0} BackupStore_directory_not_empty=Directory is not empty: {0} BackupStore_errors_while_restoring_see_log=Errors while restoring - see earlier logged errors |