diff options
| author | Raphael <raphael@google.com> | 2009-09-14 15:24:47 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2009-09-14 15:35:54 -0700 |
| commit | 8151879a7d08667b20e5c8682e7390f2a7f9b31e (patch) | |
| tree | ecf77c651c3705f8a6b8575a98281204a9b78b93 | |
| parent | 48e8ca1f521d33a3d9051db08d06f435906199d6 (diff) | |
| download | android_development-8151879a7d08667b20e5c8682e7390f2a7f9b31e.tar.gz android_development-8151879a7d08667b20e5c8682e7390f2a7f9b31e.tar.bz2 android_development-8151879a7d08667b20e5c8682e7390f2a7f9b31e.zip | |
SDK Updater: fix wrong error when unable to get repository.xml
BUG 2095530
Change-Id: I19622378b8da049f1c3416b8e0951ecc1f7475f0
3 files changed, 5 insertions, 2 deletions
diff --git a/tools/sdkmanager/app/.classpath b/tools/sdkmanager/app/.classpath index 4f2e142dd..3380ba1a7 100644 --- a/tools/sdkmanager/app/.classpath +++ b/tools/sdkmanager/app/.classpath @@ -7,5 +7,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/AndroidPrefs"/>
<classpathentry combineaccessrules="false" kind="src" path="/SdkUiLib"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ANDROID_SWT"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSource.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSource.java index d86859dce..b0bc50cf4 100755 --- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSource.java +++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/RepoSource.java @@ -192,8 +192,10 @@ public class RepoSource implements IDescription { if (exception[0] != null) {
if (exception[0] instanceof FileNotFoundException) {
reason = "File not found";
+ mFetchError += ": " + reason;
} else if (exception[0] instanceof SSLKeyException) {
- reason = "SSL error. You might want to force download through http in the settings.";
+ reason = "HTTPS SSL error. You might want to force download through HTTP in the settings.";
+ mFetchError += ": HTTPS SSL error";
} else if (exception[0].getMessage() != null) {
reason = exception[0].getMessage();
}
diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RepoSourcesAdapter.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RepoSourcesAdapter.java index de12666e2..9c6a80af2 100755 --- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RepoSourcesAdapter.java +++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/RepoSourcesAdapter.java @@ -208,7 +208,7 @@ public class RepoSourcesAdapter { packages = null;
}
- if (packages != null && source.getFetchError() != null) {
+ if (packages == null && source.getFetchError() != null) {
// Return a dummy entry to display the fetch error
return new Object[] { new RepoSourceError(source) };
}
|