From ebdf95bd00ad8d8129ab5db72467e10113f1d3b5 Mon Sep 17 00:00:00 2001 From: "yongsung1.kim" Date: Thu, 29 Aug 2013 15:03:00 +0900 Subject: [PATCH] [Title] Add log for package version check. [Issue] redmine #10310 --- .../src/org/tizen/installmanager/pkg/lib/PackageManager.java | 1 + .../src/org/tizen/installmanager/pkg/model/Package.java | 7 ++++++- .../src/org/tizen/installmanager/ui/page/ViewController.java | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java b/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java index 13a214d..05fb210 100644 --- a/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java +++ b/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java @@ -427,6 +427,7 @@ public abstract class PackageManager { for(String repoBaseUrl : repoToSectionsMap.keySet()) { for(PropertySection sect : repoToSectionsMap.get(repoBaseUrl)) { Package pkg = new Package(sect.getProperties(), repoBaseUrl); + Log.log("Check valid package version. => " + pkg); pkg.getVersion(); // Vaild version check. if (isExtensionPackage) { if (pkg.getAttribute().equalsIgnoreCase("extra")) { diff --git a/InstallManager_java/src/org/tizen/installmanager/pkg/model/Package.java b/InstallManager_java/src/org/tizen/installmanager/pkg/model/Package.java index 069b390..ebb375a 100644 --- a/InstallManager_java/src/org/tizen/installmanager/pkg/model/Package.java +++ b/InstallManager_java/src/org/tizen/installmanager/pkg/model/Package.java @@ -132,7 +132,12 @@ public class Package { * @return version of this package */ public Version getVersion() { - return new Version(getValue(FIELD_VERSION)); + try { + return new Version(getValue(FIELD_VERSION)); + } catch (IMFatalException e) { + Log.log("Invalid version package. => " + this.getPackageName()); + throw e; + } } /** diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java index c0454d3..03f4193 100644 --- a/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java +++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java @@ -763,6 +763,7 @@ public class ViewController { Log.log("Update version => " + pkg.getVersion().toString()); if (Version.compareTo(new Version(version), pkg.getVersion()) < 0) { + Log.log("Update version is higher than current version. So, installmanager will be updated."); return true; } else { return false; -- 2.7.4