Author: locilka
Date: Wed Jul 2 13:58:49 2008
New Revision: 48776
URL: http://svn.opensuse.org/viewcvs/yast?rev=48776&view=rev
Log:
Abort handling
More error handling
Modified:
trunk/packager/src/clients/webpin_package_search.ycp
Modified: trunk/packager/src/clients/webpin_package_search.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/webpin_package_search.ycp?rev=48776&r1=48775&r2=48776&view=diff
==============================================================================
--- trunk/packager/src/clients/webpin_package_search.ycp (original)
+++ trunk/packager/src/clients/webpin_package_search.ycp Wed Jul 2 13:58:49 2008
@@ -8,6 +8,7 @@
import "WebpinPackageSearch";
import "Wizard";
import "Directory";
+ import "Report";
list <map> search_results = [];
map index = $[];
@@ -20,7 +21,7 @@
any ret = UI::PollInput();
if (ret == `abort)
- return Abort();
+ return AbortDialog();
else
return false;
}
@@ -186,10 +187,14 @@
if (dialog_ret == `next){
string temporary_xml = Directory::tmpdir + "/one_click_install_temporary_file.xml";
- WebpinPackageSearch::PrepareOneClickInstallDescription (
- FilterOutSelectedPackages(),
- temporary_xml
- );
+ list <map> selected_packages = FilterOutSelectedPackages();
+
+ if (selected_packages == nil || size (selected_packages) == 0) {
+ Report::Message (_("Select some packages to install."));
+ continue;
+ }
+
+ WebpinPackageSearch::PrepareOneClickInstallDescription (selected_packages, temporary_xml);
any oci = WFM::CallFunction ("OneClickInstallUI", [temporary_xml]);
y2milestone ("OneClickInstallUI returned: %1", oci);
@@ -219,6 +224,15 @@
else if (dialog_ret == "results") {
CreatePackageDescription();
}
+ else if (dialog_ret == `abort || dialog_ret == `cancel) {
+ if (AbortDialog()) {
+ y2milestone ("Aborting...");
+ break;
+ }
+ }
+ else {
+ y2error ("Unknown ret: %1", dialog_ret);
+ }
}
return (symbol) dialog_ret;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
