From 48b3b5efc2287794a242bcbff5dfb8163b8890b0 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Thu, 6 Aug 2009 17:09:11 -0700 Subject: [PATCH] Make android.bat copy commons-compress to tmp with the other jar files. BUG: 2039759 --- tools/sdkmanager/app/etc/android.bat | 7 ++++--- .../android/sdkuilib/internal/repository/UpdaterData.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/sdkmanager/app/etc/android.bat b/tools/sdkmanager/app/etc/android.bat index b19ce0ab0..032985de4 100755 --- a/tools/sdkmanager/app/etc/android.bat +++ b/tools/sdkmanager/app/etc/android.bat @@ -43,9 +43,10 @@ if not "%1"=="" goto EndTempCopy set tmpdir=%TEMP%\temp-android-tool xcopy lib\x86 %tmpdir%\lib\x86 /I /E /C /G /R /O /Y /Q > nul - copy /B /D /Y lib\androidprefs.jar %tmpdir%\lib\ > nul - copy /B /D /Y lib\org.eclipse.* %tmpdir%\lib\ > nul - copy /B /D /Y lib\sdk* %tmpdir%\lib\ > nul + copy /B /D /Y lib\androidprefs.jar %tmpdir%\lib\ > nul + copy /B /D /Y lib\org.eclipse.* %tmpdir%\lib\ > nul + copy /B /D /Y lib\sdk* %tmpdir%\lib\ > nul + copy /B /D /Y lib\commons-compress* %tmpdir%\lib\ > nul rem jarpath and swt_path are relative to PWD so we don't need to adjust them, just change dirs. set toolsdir=%cd% diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java index a9e8afae3..6cae085ac 100755 --- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java +++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java @@ -308,7 +308,7 @@ class UpdaterData { // Display anything unexpected in the monitor. String msg = t.getMessage(); if (msg != null) { - monitor.setResult("Unexpected Error installing '%1%s: %2$s", + monitor.setResult("Unexpected Error installing '%1$s: %2$s", archive.getParentPackage().getShortDescription(), msg); } else { // no error info? get the stack call to display it