Author: ug Date: Wed May 14 11:18:00 2008 New Revision: 47516 URL: http://svn.opensuse.org/viewcvs/yast?rev=47516&view=rev Log: ask for add-on source when ask_on_error is set. 2.16.4 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on.rnc trunk/add-on/src/add-on_auto.ycp Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=47516&r1=47515&r2=47516&view=diff ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Wed May 14 11:18:00 2008 @@ -1 +1 @@ -2.16.3 +2.16.4 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.changes?rev=47516&r1=47515&r2=47516&view=diff ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Wed May 14 11:18:00 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 14 11:15:45 CEST 2008 - ug@suse.de + +- ask for add-on source when ask_on_error is set +- 2.16.4 + +------------------------------------------------------------------- Mon Apr 14 12:17:23 CEST 2008 - locilka@suse.cz - Unified Button Labels: OK instead of Accept (fate #120373). Modified: trunk/add-on/src/add-on.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on.rnc?rev=47516&r1=47515&r2=47516&view=diff ============================================================================== --- trunk/add-on/src/add-on.rnc (original) +++ trunk/add-on/src/add-on.rnc Wed May 14 11:18:00 2008 @@ -9,6 +9,7 @@ media_url? & product? & product_dir? & + ask_on_error? & element signature-handling { element accept_unsigned_file { BOOLEAN }? & element accept_file_without_checksum { BOOLEAN }? & @@ -39,6 +40,7 @@ media_url = element media_url { text } product = element product { text } product_dir = element product_dir { text } +ask_on_error = element ask_on_error { BOOLEAN } add_on_products = element add_on_products { attribute config:type { text }?, Modified: trunk/add-on/src/add-on_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on_auto.ycp?rev=47516&r1=47515&r2=47516&view=diff ============================================================================== --- trunk/add-on/src/add-on_auto.ycp (original) +++ trunk/add-on/src/add-on_auto.ycp Wed May 14 11:18:00 2008 @@ -154,18 +154,21 @@ string pth = prod["product_dir"]:"/"; sources[media] = sources[media]:$[]; AddOnProduct::SetSignatureCallbacks( prod["product"]:"" ); // set addon specific sig-handling - if (sources[media, pth]:-1 == -1) - { + //if (sources[media, pth]:-1 == -1) + do { integer srcid = Pkg::SourceCreate (media, pth); - if (srcid == -1 || srcid == nil) + if ( (srcid == -1 || srcid == nil) && !prod["ask_on_error"]:false ) // error report Report::Error (_("Failed to add add-on product.")); + else if( (srcid == -1 || srcid == nil) && prod["ask_on_error"]:false ) + prod["ask_on_error"] = Popup::ContinueCancel( sformat(_("Please make the add-on \"%1\" available via \"%2\""), prod["product"]:"" ,media) ); sources[media, pth] = srcid; // bugzilla #260613 if (srcid != -1) AddOnProduct::Integrate (srcid); AutoinstGeneral::SetSignatureHandling(); // reset to global sig-handling - } + + } while (sources[media, pth]:-1 == -1 && prod["ask_on_error"]:false); prod["media"] = sources[media, pth]:-1; Pkg::ResolvableInstall (prod["product"]:"", `product); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org