LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 7ab6ca54: Merge change 21301 into donut

Browse Source 
Merge commit '7ab6ca5451431842a6b4b458aa0f59a9bf4b3b08' into eclair

* commit '7ab6ca5451431842a6b4b458aa0f59a9bf4b3b08':
  BUG 1922590 : SDK Updater, customize message for Windows preventing
This commit is contained in:
Raphael
2009-08-18 10:39:25 -07:00
committed by Android Git Automerger
parent eea53d173b 7ab6ca5451
commit d5518ba99a
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java
View File

@@ -660,6 +660,7 @@ public class Archive implements IDescription {
} }
// Swap the old folder by the new one. // Swap the old folder by the new one.
File renameFailedForDir = null;
if (destFolder.isDirectory()) { if (destFolder.isDirectory()) {
renamedDestFolder = findTempFolder(osSdkRoot, pkgKind, "old"); //$NON-NLS-1$ renamedDestFolder = findTempFolder(osSdkRoot, pkgKind, "old"); //$NON-NLS-1$
if (renamedDestFolder == null) { if (renamedDestFolder == null) {
@@ -671,14 +672,26 @@ public class Archive implements IDescription {
if (!destFolder.renameTo(renamedDestFolder)) { if (!destFolder.renameTo(renamedDestFolder)) {
monitor.setResult("Failed to rename directory %1$s to %2$s", monitor.setResult("Failed to rename directory %1$s to %2$s",
destFolder.getPath(), renamedDestFolder.getPath()); destFolder.getPath(), renamedDestFolder.getPath());
return false; renameFailedForDir = destFolder;
} }
} }
if (!unzipDestFolder.renameTo(destFolder)) { if (renameFailedForDir == null && !unzipDestFolder.renameTo(destFolder)) {
monitor.setResult("Failed to rename directory %1$s to %2$s", monitor.setResult("Failed to rename directory %1$s to %2$s",
unzipDestFolder.getPath(), destFolder.getPath()); unzipDestFolder.getPath(), destFolder.getPath());
renameFailedForDir = unzipDestFolder;
}
if (renameFailedForDir != null) {
if (SdkConstants.CURRENT_PLATFORM == SdkConstants.PLATFORM_WINDOWS) {
monitor.setResult(
"-= Warning ! =-\n" +
"A folder failed to be renamed or moved. On Windows this " +
"typically means that a program is using that folder (for example " +
"Windows Explorer.) Please close all running programs that may be " +
"locking the directory '%1$s' and try again.",
renameFailedForDir.getPath());
}
return false; return false;
} }