September 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40777 - /trunk/core/libyui/doc/examples/Image-animated.ycp
by sh-sh-sh＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: sh-sh-sh Date: Wed Sep 5 17:04:49 2007 New Revision: 40777 URL: http://svn.opensuse.org/viewcvs/yast?rev=40777&view=rev Log: Use existing animation Modified: trunk/core/libyui/doc/examples/Image-animated.ycp Modified: trunk/core/libyui/doc/examples/Image-animated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/doc/examples/Image-a… ============================================================================== --- trunk/core/libyui/doc/examples/Image-animated.ycp (original) +++ trunk/core/libyui/doc/examples/Image-animated.ycp Wed Sep 5 17:04:49 2007 @@ -2,7 +2,7 @@ * Example for an animated image **/ { - string movie = "/usr/share/doc/packages/libqt4/examples/widgets/movie/movies/fire.mng"; + string movie = "/usr/share/YaST2/theme/current/animations/ticks-endless.mng"; UI::OpenDialog( `VBox( `MinSize( 10, 4, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40776 - /tags/stable-2_15_75/packager/
by locilka＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: locilka Date: Wed Sep 5 15:47:10 2007 New Revision: 40776 URL: http://svn.opensuse.org/viewcvs/yast?rev=40776&view=rev Log: Created tag stable-2_15_75 for packager Added: tags/stable-2_15_75/packager/ - copied from r40775, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40775 - /tags/stable-2_15_75/
by locilka＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: locilka Date: Wed Sep 5 15:47:05 2007 New Revision: 40775 URL: http://svn.opensuse.org/viewcvs/yast?rev=40775&view=rev Log: Created tag stable-2_15_75 Added: tags/stable-2_15_75/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40774 - /tags/stable-2_15_47/installation/
by locilka＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: locilka Date: Wed Sep 5 15:42:30 2007 New Revision: 40774 URL: http://svn.opensuse.org/viewcvs/yast?rev=40774&view=rev Log: Created tag stable-2_15_47 for installation Added: tags/stable-2_15_47/installation/ - copied from r40773, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40773 - /tags/stable-2_15_15/add-on/
by locilka＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: locilka Date: Wed Sep 5 15:35:05 2007 New Revision: 40773 URL: http://svn.opensuse.org/viewcvs/yast?rev=40773&view=rev Log: Created tag stable-2_15_15 for add-on Added: tags/stable-2_15_15/add-on/ - copied from r40772, trunk/add-on/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40772 - /trunk/network/src/clients/save_network.ycp
by kmachalkova＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: kmachalkova Date: Wed Sep 5 15:20:37 2007 New Revision: 40772 URL: http://svn.opensuse.org/viewcvs/yast?rev=40772&view=rev Log: missing ; Modified: trunk/network/src/clients/save_network.ycp Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Wed Sep 5 15:20:37 2007 @@ -271,7 +271,7 @@ else //If we don't have search domain data, skip 'search' field, //do not leave out 'nameserver' completely - #298001 - text = sformat("nameserver %1\n", InstallInf["nameserver"]:"") + text = sformat("nameserver %1\n", InstallInf["nameserver"]:""); y2milestone("Write resolv.conf content: %1", text); SCR::Write(.target.string, "/etc/resolv.conf", text); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40771 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/inst_check_memsize.ycp src/clients/inst_productsources.ycp src/modules/AddOnProduct.ycp yast2-packager.spec.in
by locilka＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: locilka Date: Wed Sep 5 14:59:51 2007 New Revision: 40771 URL: http://svn.opensuse.org/viewcvs/yast?rev=40771&view=rev Log: - Reading and using proxy settings before inst_productsources starts downloading files (#307680). - Initializing packager callbacks in inst_productsources on a running system (#307652). - Warning when inst_productsources is called in installation and the inst-sys has not enough memory (#305554). - Adjusted RPM dependencies. - 2.15.75 Added: trunk/packager/src/clients/inst_check_memsize.ycp Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_productsources.ycp trunk/packager/src/modules/AddOnProduct.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=40771&r1=40… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Sep 5 14:59:51 2007 @@ -1 +1 @@ -2.15.74 +2.15.75 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Sep 5 14:59:51 2007 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Sep 5 13:41:41 CEST 2007 - locilka(a)suse.cz + +- Reading and using proxy settings before inst_productsources + starts downloading files (#307680). +- Initializing packager callbacks in inst_productsources on + a running system (#307652). +- Warning when inst_productsources is called in installation and + the inst-sys has not enough memory (#305554). +- Adjusted RPM dependencies. +- 2.15.75 + +------------------------------------------------------------------- Mon Sep 3 16:41:26 CEST 2007 - locilka(a)suse.cz - Correctly evaluating relurl:// parameters, such as Added: trunk/packager/src/clients/inst_check_memsize.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_check_… ============================================================================== --- trunk/packager/src/clients/inst_check_memsize.ycp (added) +++ trunk/packager/src/clients/inst_check_memsize.ycp Wed Sep 5 14:59:51 2007 @@ -0,0 +1,27 @@ +/** + * File: clients/inst_check_memsize.ycp + * Package: Installation + * Summary: Checking whether system has enough memory (bugzilla #305554) + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * + * $Id:$ + * + */ + +{ + include "add-on/misc.ycp"; + + // Memory is low + if (HasInsufficientMemory()) { + // User wants to continue + if (ContinueIfInsufficientMemory ()) { + return `continue; + // User wants to skip + } else { + return `skip; + } + } + + // Enough memory + return `continue; +} Modified: trunk/packager/src/clients/inst_productsources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_produc… ============================================================================== --- trunk/packager/src/clients/inst_productsources.ycp (original) +++ trunk/packager/src/clients/inst_productsources.ycp Wed Sep 5 14:59:51 2007 @@ -68,6 +68,7 @@ import "Stage"; import "Report"; import "CommandLine"; + import "PackageCallbacks"; import "FileUtils"; import "HTTP"; @@ -82,6 +83,11 @@ include "installation/misc.ycp"; + if (AddOnProduct::skip_add_ons) { + y2milestone ("Skipping module (as requested before)"); + return `auto; + } + if (GetInstArgs::going_back()) { y2milestone ("Going back..."); return `back; @@ -118,6 +124,43 @@ return sformat ("(%1|%2)", s_url, s_path); } + + + // See bugzilla #307680 + // Proxy needs to be read from sysconfig and + // set by setenv() builtin + void InitProxySettings () { + y2milestone ("Adjusting proxy settings"); + + map <string, string> proxy_items = $[ + "http_proxy":"HTTP_PROXY", "FTP_PROXY":"FTP_PROXY", + "HTTPS_PROXY":"HTTPS_PROXY", "NO_PROXY":"NO_PROXY", + ]; + boolean use_proxy = false; + + SCR::RegisterAgent ( + .current_proxy_settings, + `ag_ini( + `SysConfigFile("/etc/sysconfig/proxy") + ) + ); + + use_proxy = (SCR::Read(.sysconfig.proxy.PROXY_ENABLED) != "no"); + + string item_value = ""; + foreach (string proxy_item, string sysconfig_item, proxy_items, { + item_value = (string) SCR::Read (add (.sysconfig.proxy, sysconfig_item)); + if (item_value == nil) item_value = ""; + + if (use_proxy == true && item_value != "") { + y2milestone ("Adjusting '%1'='%2'", proxy_item, item_value); + setenv (proxy_item, item_value); + } + }); + + SCR::UnregisterAgent (.current_proxy_settings); + } + // Function returns whether user wants to abort the installation / configuration // true - abort // false - do not abort @@ -312,6 +355,10 @@ y2milestone ("Server response: %1", server_response); + if (server_response == nil) { + return false; + } + return true; } @@ -424,7 +471,7 @@ map cmd = (map) SCR::Execute (.target.bash_output, "echo -n $LANG"); string ret = tostring (cmd["stdout"]:""); - if (ret == "C" || ret == "") ret = nil; + if (ret == "C" || ret == "" || ret == "POSIX") ret = nil; y2milestone ("Using lang: %1", ret); return ret; @@ -471,6 +518,23 @@ if (UserWantsToAbort()) return `abort; + // Bugzilla #305554 + // Check if there is enough memory (only in inst-sys) + // Called via WFM::call because of breaking RPM dependencies + // on yast2-add-on package. + if (Stage::initial()) { + any client_ret = WFM::call ("inst_check_memsize"); + + if (client_ret == `skip) { + // do not use them next time + Installation::add_on_selected = false; + Installation::productsources_selected = false; + y2milestone ("Skipping inst_productsources"); + + return `skip; + } + } + if (! NetworkRunning()) { y2warning ("Cannot proceed, no network configured..."); // TRANSLATORS: error report @@ -502,6 +566,15 @@ } Progress::NextStage(); + + if (UserWantsToAbort()) return `abort; + + // hotfix for bug #307680 + // yast2-transfer ignores proxy settings + // will be fixed globally after 10.3 + if (Mode::normal()) { + InitProxySettings(); + } if (UserWantsToAbort()) return `abort; @@ -513,7 +586,14 @@ if (language_long == nil) language_long = Language::language; - language_short = substring (language_long, 0, 2); + if (language_long != nil) { + if (size(language_long) >= 2) { + language_short = substring (language_long, 0, 2); + } else { + language_short = language_long; + } + } + y2milestone ("Preferred language: %1 %2", language_long, language_short); if (UserWantsToAbort()) return `abort; @@ -1218,6 +1298,8 @@ "ws_start" : "read", "read" : $[ `next : "sources", + // not enough memory + `skip : `next, `nosources : `next, `abort : `abort, ], Modified: trunk/packager/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/AddOnProduc… ============================================================================== --- trunk/packager/src/modules/AddOnProduct.ycp (original) +++ trunk/packager/src/modules/AddOnProduct.ycp Wed Sep 5 14:59:51 2007 @@ -89,6 +89,11 @@ // In installation: check for low-memory machines global boolean low_memory_already_reported = false; +// Bugzilla #305554 +// Both online-repositories and add-ons use the same function and variable +// if true, both are skipped at once without asking +global boolean skip_add_ons = false; + // --> FATE #302123: Allow relative paths in "add_on_products" file string base_product_url = nil; Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?… ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Wed Sep 5 14:59:51 2007 @@ -26,6 +26,12 @@ # XML module (inst_productsources.ycp) Requires: yast2-xml +# setenv() builtin +Conflicts: yast2-core < 2.15.10 + +# NotEnoughMemory-related functions moved to misc.ycp import-file +Conflicts: yast2-add-on < 2.15.15 + Provides: yast2-config-package-manager Obsoletes: yast2-config-package-manager Provides: y2t_spkg y2t_inst-packages y2pkginf y2c_spkg -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40770 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_system_analysis.ycp yast2-installation.spec.in
by locilka＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: locilka Date: Wed Sep 5 14:58:13 2007 New Revision: 40770 URL: http://svn.opensuse.org/viewcvs/yast?rev=40770&view=rev Log: - Reinitializing variable for skipping add-on-related clients with its default value in inst_system_analysis (#305554). - 2.15.47 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_system_analysis.ycp trunk/installation/yast2-installation.spec.in Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=40770&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Wed Sep 5 14:58:13 2007 @@ -1 +1 @@ -2.15.46 +2.15.47 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Sep 5 14:58:13 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Sep 5 14:48:33 CEST 2007 - locilka(a)suse.cz + +- Reinitializing variable for skipping add-on-related clients with + its default value in inst_system_analysis (#305554). +- 2.15.47 + +------------------------------------------------------------------- Wed Sep 5 13:24:32 CEST 2007 - jsrain(a)suse.cz - removed inst_fam.ycp (also from control files) (#307378) Modified: trunk/installation/src/clients/inst_system_analysis.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_sy… ============================================================================== --- trunk/installation/src/clients/inst_system_analysis.ycp (original) +++ trunk/installation/src/clients/inst_system_analysis.ycp Wed Sep 5 14:58:13 2007 @@ -42,6 +42,9 @@ string start_mode = Mode::mode (); +// always check whether user wants to continue +AddOnProduct::skip_add_ons = false; + // Function definitions --> // -------------------------------------------------------------- Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.… ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Wed Sep 5 14:58:13 2007 @@ -15,8 +15,8 @@ # Language::selection_skipped, bugzilla #223258 Requires: yast2-country >= 2.15.0 Requires: yast2-network >= 2.15.37 -# .anyxml SCR agent -Requires: yast2-packager >= 2.15.51 +# AddOnProduct::skip_add_ons +Requires: yast2-packager >= 2.15.75 # Only in inst-sys # Requires: yast2-add-on -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40769 - in /trunk/add-on: package/yast2-add-on.changes src/inst_add-on.ycp src/misc.ycp yast2-add-on.spec.in
by locilka＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: locilka Date: Wed Sep 5 14:47:20 2007 New Revision: 40769 URL: http://svn.opensuse.org/viewcvs/yast?rev=40769&view=rev Log: - Skipping Add-Ons when requested by user (#305554). - Adjusted RPM dependencies. Modified: trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/inst_add-on.ycp trunk/add-on/src/misc.ycp trunk/add-on/yast2-add-on.spec.in Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Wed Sep 5 14:47:20 2007 @@ -3,6 +3,8 @@ - NotEnoughMemory-functions moved to a separate misc.ycp include file to make them possible to be used from packager (#305554). +- Skipping Add-Ons when requested by user (#305554). +- Adjusted RPM dependencies. - 2.15.15 ------------------------------------------------------------------- Modified: trunk/add-on/src/inst_add-on.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/inst_add-on.ycp?rev=4… ============================================================================== --- trunk/add-on/src/inst_add-on.ycp (original) +++ trunk/add-on/src/inst_add-on.ycp Wed Sep 5 14:47:20 2007 @@ -21,6 +21,11 @@ include "add-on/add-on-workflow.ycp"; +if (AddOnProduct::skip_add_ons) { + y2milestone ("Skipping add-ons (as requested before)"); + return `auto; +} + map argmap = GetInstArgs::argmap(); Packages::SelectProduct (); Modified: trunk/add-on/src/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/misc.ycp?rev=40769&r1… ============================================================================== --- trunk/add-on/src/misc.ycp (original) +++ trunk/add-on/src/misc.ycp Wed Sep 5 14:47:20 2007 @@ -71,6 +71,7 @@ Do you want to skip using add-on products?") )) { y2milestone ("User decided to skip Add-Ons"); + AddOnProduct::skip_add_ons = true; return false; } else { Modified: trunk/add-on/yast2-add-on.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/yast2-add-on.spec.in?rev=… ============================================================================== --- trunk/add-on/yast2-add-on.spec.in (original) +++ trunk/add-on/yast2-add-on.spec.in Wed Sep 5 14:47:20 2007 @@ -6,8 +6,9 @@ Requires: yast2 >= 2.15.22 Requires: yast2-installation Requires: yast2-country -# AddOnProduct::low_memory_already_reported -Requires: yast2-packager >= 2.15.27 + +# AddOnProduct::skip_add_ons +Requires: yast2-packager >= 2.15.75 Requires: yast2-storage BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-installation yast2-packager yast2-storage -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40768 - /trunk/network/package/yast2-network.changes
by kmachalkova＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: kmachalkova Date: Wed Sep 5 14:29:37 2007 New Revision: 40768 URL: http://svn.opensuse.org/viewcvs/yast?rev=40768&view=rev Log: changelog up :) Modified: trunk/network/package/yast2-network.changes Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Sep 5 14:29:37 2007 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Sep 5 14:23:30 CEST 2007 - kmachalkova(a)suse.cz + +- Proxy testsuite adjusted to correct .curlrc syntax (#305163 related) +- Fix downloading release notes with proxy (#305222) +- Save proxy settings at the end of 1st stage of installation + (#298001) +- Save nameserver entry at the end of 1st stage of installation even + if no search domain is present in install.inf (#298001) + +------------------------------------------------------------------- Tue Sep 4 15:14:46 CEST 2007 - mzugec(a)suse.cz - WLAN Installation - save data from install.inf (#223570) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0