September 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r51659 - /tags/stable-2_17_16/pkg-bindings/
by lslezak＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: lslezak Date: Mon Sep 29 15:54:18 2008 New Revision: 51659 URL: http://svn.opensuse.org/viewcvs/yast?rev=51659&view=rev Log: Created tag stable-2_17_16 for pkg-bindings Added: tags/stable-2_17_16/pkg-bindings/ - copied from r51658, trunk/pkg-bindings/ -- 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] r51658 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes
by lslezak＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: lslezak Date: Mon Sep 29 15:53:35 2008 New Revision: 51658 URL: http://svn.opensuse.org/viewcvs/yast?rev=51658&view=rev Log: - 2.17.16 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=51658&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Mon Sep 29 15:53:35 2008 @@ -1 +1 @@ -2.17.15 +2.17.16 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Mon Sep 29 15:53:35 2008 @@ -5,6 +5,9 @@ connection (affected calls Pkg::SourceLoad(), Pkg::SourceStartManager() and PkgFunctions::SourceStartCache()) (bnc#401966) +- ResolvableProperties() - return more info about product + ("register_target", "register_release" and "flavor" keys) +- 2.17.16 ------------------------------------------------------------------- Thu Sep 25 17:54:02 CEST 2008 - lslezak(a)suse.cz -- 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] r51657 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Makefile.am src/PkgFunctions.h src/Resolvable_Properties.cc src/Source_Load.cc src/Source_Resolvables.cc
by lslezak＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: lslezak Date: Mon Sep 29 15:51:36 2008 New Revision: 51657 URL: http://svn.opensuse.org/viewcvs/yast?rev=51657&view=rev Log: - do not autorefresh remote repositories when there is no network connection (affected calls Pkg::SourceLoad(), Pkg::SourceStartManager() and PkgFunctions::SourceStartCache()) (bnc#401966) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Makefile.am trunk/pkg-bindings/src/PkgFunctions.h trunk/pkg-bindings/src/Resolvable_Properties.cc trunk/pkg-bindings/src/Source_Load.cc trunk/pkg-bindings/src/Source_Resolvables.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Mon Sep 29 15:51:36 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Sep 29 14:27:21 CEST 2008 - lslezak(a)suse.cz + +- do not autorefresh remote repositories when there is no network + connection (affected calls Pkg::SourceLoad(), + Pkg::SourceStartManager() and PkgFunctions::SourceStartCache()) + (bnc#401966) + +------------------------------------------------------------------- Thu Sep 25 17:54:02 CEST 2008 - lslezak(a)suse.cz - removed another usage of the old logging (bnc#429954) Modified: trunk/pkg-bindings/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Makefile.am?rev… ============================================================================== --- trunk/pkg-bindings/src/Makefile.am (original) +++ trunk/pkg-bindings/src/Makefile.am Mon Sep 29 15:51:36 2008 @@ -54,6 +54,7 @@ PkgService.cc PkgService.h \ ServiceManager.cc ServiceManager.h \ Service.cc \ + Network.cc \ HelpTexts.h i18n.h log.h Modified: trunk/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgFunctions.h?… ============================================================================== --- trunk/pkg-bindings/src/PkgFunctions.h (original) +++ trunk/pkg-bindings/src/PkgFunctions.h Mon Sep 29 15:51:36 2008 @@ -112,13 +112,19 @@ YCPValue SourceRefreshHelper(const YCPInteger &id, bool forced = false); + // helper - is the network running? + bool NetworkDetected(); + + // is the URL remote? + bool remoteRepo(const zypp::Url &url); + // conversion methods for type string between Yast and libzypp (for backward compatibility) std::string zypp2yastType(const std::string &type); std::string yast2zyppType(const std::string &type); void RemoveResolvablesFrom(const std::string &alias); bool AnyResolvableFrom(const std::string &alias); - bool LoadResolvablesFrom(const zypp::RepoInfo &repoinfo, const zypp::ProgressData::ReceiverFnc & progressrcv = zypp::ProgressData::ReceiverFnc()); + bool LoadResolvablesFrom(const zypp::RepoInfo &repoinfo, const zypp::ProgressData::ReceiverFnc & progressrcv = zypp::ProgressData::ReceiverFnc(), bool network_check = false); std::string UniqueAlias(const std::string &alias); YCPValue GetPkgLocation(const YCPString& p, bool full_path); Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Prop… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Mon Sep 29 15:51:36 2008 @@ -92,6 +92,9 @@ + "optional_urls" + "register_urls" + "smolt_urls" + + "register_target" + + "register_release" + + "flavor" + "replaces" + "name" + "version" @@ -397,6 +400,13 @@ info->add(YCPString("smolt_urls"), smoltUrls); } + // registration data + info->add(YCPString("register_target"), YCPString(product->registerTarget())); + info->add(YCPString("register_release"), YCPString(product->registerRelease())); + + // Live CD, FTP Edition... + info->add(YCPString("flavor"), YCPString(product->flavor())); + // get the installed Products it would replace. zypp::Product::ReplacedProducts replaced(product->replacedProducts()); Modified: trunk/pkg-bindings/src/Source_Load.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Load.cc?… ============================================================================== --- trunk/pkg-bindings/src/Source_Load.cc (original) +++ trunk/pkg-bindings/src/Source_Load.cc Mon Sep 29 15:51:36 2008 @@ -190,6 +190,8 @@ autorefresh_skipped = false; CallRefreshStarted(); + bool network_is_running = NetworkDetected(); + if (repos_to_refresh > 0) { // refresh metadata @@ -216,6 +218,19 @@ // autorefresh the source if ((*it)->repoInfo().autorefresh() || raw_metadata_status.empty()) { + // do not autorefresh remote repositories when the network is not running + if (!network_is_running) + { + zypp::Url url = *((*it)->repoInfo().baseUrlsBegin()); + + if (remoteRepo(url)) + { + y2warning("No network connection, skipping autorefresh of remote repository %s (%s)", + (*it)->repoInfo().alias().c_str(), url.asString().c_str()); + continue; + } + } + try { y2milestone("Autorefreshing source: %s", (*it)->repoInfo().alias().c_str()); @@ -279,16 +294,13 @@ // autorefresh the source if ((*it)->repoInfo().autorefresh()) { - if (autorefresh_skipped) - { - zypp::RepoStatus raw_metadata_status = repomanager.metadataStatus((*it)->repoInfo()); + zypp::RepoStatus raw_metadata_status = repomanager.metadataStatus((*it)->repoInfo()); - // autorefresh the source - if (raw_metadata_status.empty() ) - { - y2error("Missinga metadata, not rebuilding the cache"); - continue; - } + // autorefresh the source + if (raw_metadata_status.empty() ) + { + y2error("Missinga metadata, not rebuilding the cache"); + continue; } try @@ -352,8 +364,8 @@ } else { - // load objects - success = LoadResolvablesFrom((*it)->repoInfo(), load_subprogress) && success; + // load objects, do network status check + success = LoadResolvablesFrom((*it)->repoInfo(), load_subprogress, true) && success; } } y2debug("Progress status: %lld", prog_total.val()); Modified: trunk/pkg-bindings/src/Source_Resolvables.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Resolvab… ============================================================================== --- trunk/pkg-bindings/src/Source_Resolvables.cc (original) +++ trunk/pkg-bindings/src/Source_Resolvables.cc Mon Sep 29 15:51:36 2008 @@ -64,7 +64,7 @@ * A helper function - load resolvable from the repository into the pool * Warning: Use AnyResolvableFrom() method for checing if the resolvables might be already loaded */ -bool PkgFunctions::LoadResolvablesFrom(const zypp::RepoInfo &repoinfo, const zypp::ProgressData::ReceiverFnc &progressrcv) +bool PkgFunctions::LoadResolvablesFrom(const zypp::RepoInfo &repoinfo, const zypp::ProgressData::ReceiverFnc &progressrcv, bool network_check) { bool success = true; unsigned int size_start = zypp_ptr()->pool().size(); @@ -78,6 +78,7 @@ try { zypp::RepoManager repomanager = CreateRepoManager(); + bool refresh = true; // build cache if needed if (!repomanager.isCached(repoinfo) && !autorefresh_skipped) @@ -85,17 +86,36 @@ zypp::RepoStatus raw_metadata_status = repomanager.metadataStatus(repoinfo); if (raw_metadata_status.empty()) { - y2milestone("Missing metadata for source '%s', downloading...", repoinfo.alias().c_str()); + if (network_check) + { + zypp::Url url = *(repoinfo.baseUrlsBegin()); - CallRefreshStarted(); + if (remoteRepo(url) && !NetworkDetected()) + { + y2warning("No network connection, skipping autorefresh of remote repository %s (%s)", + repoinfo.alias().c_str(), url.asString().c_str()); - RefreshWithCallbacks(repoinfo); + refresh = false; + } + } - CallRefreshDone(); + if (refresh) + { + y2milestone("Missing metadata for source '%s', downloading...", repoinfo.alias().c_str()); + + CallRefreshStarted(); + + RefreshWithCallbacks(repoinfo); + + CallRefreshDone(); + } } - y2milestone("Caching source '%s'...", repoinfo.alias().c_str()); - repomanager.buildCache(repoinfo, zypp::RepoManager::BuildIfNeeded, load_subprogress); + if (refresh) + { + y2milestone("Caching source '%s'...", repoinfo.alias().c_str()); + repomanager.buildCache(repoinfo, zypp::RepoManager::BuildIfNeeded, load_subprogress); + } } repomanager.loadFromCache(repoinfo); -- 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] r51656 - /trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp
by jsuchome＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: jsuchome Date: Mon Sep 29 15:50:29 2008 New Revision: 51656 URL: http://svn.opensuse.org/viewcvs/yast?rev=51656&view=rev Log: new agent return values Modified: trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp Modified: trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/users_plu… ============================================================================== --- trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp (original) +++ trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp Mon Sep 29 15:50:29 2008 @@ -117,6 +117,7 @@ } // helper function, form the string for UI from actuall data + // FIXME we don't know number of remaining swipes... void replace_swipe_string () { UI::ReplaceWidget (`id (`rpstatus), `Label ( @@ -125,6 +126,14 @@ swipe_success, swipe_failed) )); } + + + void status_message (string label, string message) { + UI::ReplaceWidget (`id (`rp), `Label (label)); + UI::ReplaceWidget (`id (`rpstatus), `Label (message)); + } + + if (SCR::Execute (.fprint.enroll, bir_path) != true) { ui = `cancel; @@ -132,13 +141,16 @@ UI::ReplaceWidget (`id (`rp), `Label (_("Initialization of fingerprint reader failed."))); } +// FIXME show generic message... the user can enroll finger while (ui != `cancel) { map statemap = (map) SCR::Read (.fprint.state); if (statemap != nil && statemap != $[]) { integer state = statemap["state"]:0; +y2security ("state: %1", state); switch (state) { + /* case 8: { // TF_STATE_ACQUIRE_SUCCESS UI::ReplaceWidget (`id (`rp), // status label @@ -176,7 +188,7 @@ replace_swipe_string (); break; } - + */ case 1: { // FP_ENROLL_COMPLETE UI::ReplaceWidget (`id (`rp), // status label @@ -185,13 +197,70 @@ exit = true; break; } - case -1: { // FP_ENROLL_FAIL FIXME - UI::ReplaceWidget (`id (`rp), - `Label (_("Acquiring fingerprint failed."))); + case 2: { // FP_ENROLL_FAILED ?? FIXME + status_message ( + // status label + _("Scan failed."), + // status message + _("Swipe finger again.")); + break; + } + case 3: { // FP_ENROLL_PASS + swipe_success = swipe_success + 1; +// replace_swipe_string (); + + status_message ( + // status label + _("Enroll stage passed."), + // status message + _("Swipe finger again.")); + break; + } + case 101: { // FP_ENROLL_RETRY_TOO_SHORT: + + status_message ( + // status label + _("Scan failed."), + // status message + _("Swipe was too short, try again.")); + break; + } + case 102: { // FP_ENROLL_RETRY_CENTER_FINGER: + + status_message ( + // status label + _("Scan failed."), + // status message + _("Center your finger on the sensor and try again.")); + break; + } + case 103: { // FP_ENROLL_RETRY_REMOVE_FINGER: + + // status message + status_message ( + // status label + _("Scan failed."), + // status message + _("Remove your finger and try again.")); + break; + } + case -1: { // FP_ENROLL_FAIL + // some fatal error + status_message ( + // status label + _("Acquiring fingerprint failed."), ""); exit = true; break; } } + if (state < -1) + { + // some fatal error + status_message ( + // status label + _("Acquiring fingerprint failed."), ""); + exit = true; + } } else if (statemap == nil) { @@ -217,10 +286,6 @@ sleep (100); } y2milestone ("agent exit status: %1", exit_status); -// FIXME FIXME - // 9 is failed acquire, 253 is USB error, 254 communication error - // FIXME what's the meaning of TF_STATE_ENROLL_SUCCESS (7)? -// if (exit_status == 7 || exit_status == 8) if (exit_status == 1) { // status label @@ -253,6 +318,7 @@ ret = UI::UserInput (); if (ret == `next) { + // FIXME no bir file can be defined yet FIXME // modified data to add to user map<string, any> tmp_data = $[ "bir_file" : username, -- 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] r51655 - /trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc
by jsuchome＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: jsuchome Date: Mon Sep 29 15:49:21 2008 New Revision: 51655 URL: http://svn.opensuse.org/viewcvs/yast?rev=51655&view=rev Log: fatal exits Modified: trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc Modified: trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-fprint/… ============================================================================== --- trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc (original) +++ trunk/fingerprint-reader/agent-fprint/src/FPrintAgent.cc Mon Sep 29 15:49:21 2008 @@ -135,11 +135,16 @@ sleep (1); y2internal ("Scan your finger now."); + // FIXME not possible, this is total number of stages + y2milestone ("remaining stages: %d", fp_dev_get_nr_enroll_stages(dev)); + r = fp_enroll_finger (dev, &enrolled_print); if (r < 0) { y2error ("Enroll failed with error %d", r); -// break; FIXME what now? + instance().finalize (); + signal (15, SIG_DFL); + return r; } y2internal ("retval: %d", r); if (write (write_fd, &r, sizeof (int)) == -1) @@ -152,8 +157,9 @@ break; case FP_ENROLL_FAIL: y2milestone("Enroll failed, something wen't wrong :("); -// return NULL; FIXME - break; + instance().finalize (); + signal (15, SIG_DFL); + return r; case FP_ENROLL_PASS: y2milestone("Enroll stage passed. Yay!"); break; -- 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] r51654 - in /trunk/bootloader: package/yast2-bootloader.changes src/generic/dialogs.ycp
by jsrain＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: jsrain Date: Mon Sep 29 15:46:03 2008 New Revision: 51654 URL: http://svn.opensuse.org/viewcvs/yast?rev=51654&view=rev Log: avoid mixing options of different bootloader after loaded type change Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/generic/dialogs.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Mon Sep 29 15:46:03 2008 @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Mon Sep 29 14:55:55 CEST 2008 - jsrain(a)suse.cz +Mon Sep 29 15:45:41 CEST 2008 - jsrain(a)suse.cz - fixed no scrren contents after changing loader type (bnc #427622) +- avoid mixing options of different bootloader after loaded type + change ------------------------------------------------------------------- Thu Sep 25 17:44:24 CEST 2008 - juhliarik(a)suse.cz Modified: trunk/bootloader/src/generic/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/dialogs.y… ============================================================================== --- trunk/bootloader/src/generic/dialogs.ycp (original) +++ trunk/bootloader/src/generic/dialogs.ycp Mon Sep 29 15:46:03 2008 @@ -50,6 +50,10 @@ global void importMetaData() { BootCommon::exports = BootCommon::GetMetaData (); + // clean option list, otherwise options of different bootloaders + // get mixed after bootloader switch + BootCommon::global_options = $[]; + BootCommon::section_options = $[]; // Extract type descriptions from exports foreach(string key, any value, BootCommon::exports, { -- 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] r51653 - /tags/stable-2_17_6/support/
by mzugec＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: mzugec Date: Mon Sep 29 15:39:39 2008 New Revision: 51653 URL: http://svn.opensuse.org/viewcvs/yast?rev=51653&view=rev Log: Created tag stable-2_17_6 for support Added: tags/stable-2_17_6/support/ (props changed) - copied from r51652, trunk/support/ -- 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] r51652 - in /trunk/support: VERSION package/yast2-support.changes src/dialogs.ycp
by mzugec＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: mzugec Date: Mon Sep 29 15:39:32 2008 New Revision: 51652 URL: http://svn.opensuse.org/viewcvs/yast?rev=51652&view=rev Log: added support for new identifiers (fate#305243) Modified: trunk/support/VERSION trunk/support/package/yast2-support.changes trunk/support/src/dialogs.ycp Modified: trunk/support/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/VERSION?rev=51652&r1=516… ============================================================================== --- trunk/support/VERSION (original) +++ trunk/support/VERSION Mon Sep 29 15:39:32 2008 @@ -1 +1 @@ -2.17.5 +2.17.6 Modified: trunk/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/package/yast2-support.ch… ============================================================================== --- trunk/support/package/yast2-support.changes (original) +++ trunk/support/package/yast2-support.changes Mon Sep 29 15:39:32 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 29 15:37:11 CEST 2008 - mzugec(a)suse.cz + +- added support for new identifiers (fate#305243) +- 2.17.6 + +------------------------------------------------------------------- Mon Sep 29 14:29:09 CEST 2008 - mzugec(a)suse.cz - split Overview into Overview and Upload Modified: trunk/support/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/dialogs.ycp?rev=5165… ============================================================================== --- trunk/support/src/dialogs.ycp (original) +++ trunk/support/src/dialogs.ycp Mon Sep 29 15:39:32 2008 @@ -138,8 +138,6 @@ Wizard::SetContentsButtons(caption, contents, HELPS["c1"]:"", Label::BackButton(), Label::NextButton()); -// Wizard::DisableBackButton(); - any ret = nil; while(true) { ret = UI::UserInput(); @@ -348,7 +346,9 @@ `Left(`InputField(`id(`company), _("Company"), Support::options["VAR_OPTION_CONTACT_COMPANY"]:"")), `Left(`InputField(`id(`email), _("Email Address"), Support::options["VAR_OPTION_CONTACT_EMAIL"]:"")), `Left(`InputField(`id(`name), _("Name"), Support::options["VAR_OPTION_CONTACT_NAME"]:"")), - `Left(`InputField(`id(`phone), _("Phone Number"), Support::options["VAR_OPTION_CONTACT_PHONE"]:"")) + `Left(`InputField(`id(`phone), _("Phone Number"), Support::options["VAR_OPTION_CONTACT_PHONE"]:"")), + `Left(`InputField(`id(`storeid), _("Store ID"), Support::options["VAR_OPTION_CONTACT_STOREID"]:"")), + `Left(`InputField(`id(`terminalid), _("Terminal ID"), Support::options["VAR_OPTION_CONTACT_TERMINALID"]:"")) )), `Frame (_("Upload Informations"), `VBox( `Left(`InputField(`id(`target), _("Upload Target"), Support::options["VAR_OPTION_UPLOAD_TARGET"]:"")), @@ -373,6 +373,8 @@ Support::options["VAR_OPTION_CONTACT_EMAIL"]=(string)UI::QueryWidget(`email, `Value); Support::options["VAR_OPTION_CONTACT_NAME"]=(string)UI::QueryWidget(`name, `Value); Support::options["VAR_OPTION_CONTACT_PHONE"]=(string)UI::QueryWidget(`phone, `Value); + Support::options["VAR_OPTION_CONTACT_STOREID"]=(string)UI::QueryWidget(`storeid, `Value); + Support::options["VAR_OPTION_CONTACT_TERMINALID"]=(string)UI::QueryWidget(`terminalid, `Value); Support::options["VAR_OPTION_UPLOAD_TARGET"]=(string)UI::QueryWidget(`target, `Value); Support::novell_number=(string)UI::QueryWidget(`novell_number, `Value); Support::WriteConfig(); -- 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] r51651 - in /trunk/wagon/src: ./ clients/ config/ modules/
by locilka＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: locilka Date: Mon Sep 29 15:26:56 2008 New Revision: 51651 URL: http://svn.opensuse.org/viewcvs/yast?rev=51651&view=rev Log: Wagon reworked "a bit" - New Wagon YCP module - Client wagon_selfupdate uses online_update - Client wagon_you has been replaced with a generic inst_proposal call Added: trunk/wagon/src/modules/ trunk/wagon/src/modules/Makefile.am trunk/wagon/src/modules/Wagon.ycp (props changed) - copied unchanged from r51633, trunk/wagon/src/clients/Wagon.ycp Removed: trunk/wagon/src/clients/Wagon.ycp trunk/wagon/src/clients/wagon_you.ycp Modified: trunk/wagon/src/Makefile.am trunk/wagon/src/clients/Makefile.am trunk/wagon/src/clients/wagon_selfupdate.ycp trunk/wagon/src/clients/welcome_in_wagon.ycp trunk/wagon/src/config/online_migration.xml Modified: trunk/wagon/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/Makefile.am?rev=51651&… ============================================================================== --- trunk/wagon/src/Makefile.am (original) +++ trunk/wagon/src/Makefile.am Mon Sep 29 15:26:56 2008 @@ -2,5 +2,5 @@ # Makefile.am for wagon/src # -SUBDIRS = clients config +SUBDIRS = modules clients config Modified: trunk/wagon/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/Makefile.am?re… ============================================================================== --- trunk/wagon/src/clients/Makefile.am (original) +++ trunk/wagon/src/clients/Makefile.am Mon Sep 29 15:26:56 2008 @@ -4,8 +4,8 @@ client_DATA = $(wildcard *.ycp) -module_DATA = $(wildcard [A-Z]*.ycp) +YCPCFLAGS = -M ../modules -EXTRA_DIST = $(client_DATA) $(module_DATA) +EXTRA_DIST = $(client_DATA) include $(top_srcdir)/Makefile.am.common Modified: trunk/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_selfupda… ============================================================================== --- trunk/wagon/src/clients/wagon_selfupdate.ycp (original) +++ trunk/wagon/src/clients/wagon_selfupdate.ycp Mon Sep 29 15:26:56 2008 @@ -16,78 +16,45 @@ */ { - import "Wizard"; + textdomain "wagon"; + import "GetInstArgs"; - import "Popup"; - import "Internet"; - import "Installation"; - import "PackageCallbacks"; - import "ProductControl"; - import "Stage"; - import "Mode"; - import "Report"; - import "FileUtils"; import "Wagon"; + import "FileUtils"; + import "ProductControl"; + import "Internet"; - textdomain "wagon"; - - map argmap = GetInstArgs::argmap(); + if (GetInstArgs::going_back()) { + y2milestone ("Going back..."); + return `back; + } Wagon::InitPkg(); - // heading text - string heading_text = _("Wagon Self-Update"); - - term contents = `VBox ( - `Label (_("Wagon has just updated itself")) - ); - - // help text - string help_text = _("<p>FIXME: some help is needed</p>"); - - Wizard::SetContents (heading_text, contents, help_text, - argmap["enable_back"]:true , argmap["enable_next"]:true); - Wizard::EnableAbortButton (); - list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); y2milestone ("All known products: %1", products); + symbol ret = `auto; -// ---> string old_md5sum = FileUtils::MD5sum (ProductControl::custom_control_file); // Here the update stack updates itself - - // FIXME: replace with calling the update - Report::Message ("If you change the workflow definition file now, -YaST will be restarted."); + Internet::do_you = true; + integer you_retval = (integer) WFM::call ("online_update"); + y2milestone ("Online update returned: %1", you_retval); + + if (you_retval == 0 || you_retval == 1) { + ret = `next; + } else { + ret = `restart_same_step; + } string new_md5sum = FileUtils::MD5sum (ProductControl::custom_control_file); if (old_md5sum != new_md5sum) { - y2milestone ("Workflow might have changed, rereading..."); - return `restart_same_step; - } -// <--- - - - any ret = nil; - - while (true) { - ret = UI::UserInput(); - - if (ret == `back) { - break; - } else if ((ret == `abort || ret == `cancel) && Popup::ConfirmAbort (`painless)) { - Wizard::RestoreNextButton(); - ret = `abort; - break; - } else if (ret == `next) { - break; - } else { - y2error ("Unknown ret: %1", ret); - } + y2milestone ("Workflow have changed, rereading..."); + ret = `restart_same_step; } - return (symbol) ret; + return ret; } Modified: trunk/wagon/src/clients/welcome_in_wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/welcome_in_wag… ============================================================================== --- trunk/wagon/src/clients/welcome_in_wagon.ycp (original) +++ trunk/wagon/src/clients/welcome_in_wagon.ycp Mon Sep 29 15:26:56 2008 @@ -50,7 +50,6 @@ if (ret == `back) { break; } else if ((ret == `abort || ret == `cancel) && Popup::ConfirmAbort (`painless)) { - Wizard::RestoreNextButton(); ret = `abort; break; } else if (ret == `next) { @@ -61,5 +60,8 @@ } } + // Clear the dialog + Wizard::SetContents ("", `Empty(), "", true, true); + return ret; } Modified: trunk/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/config/online_migratio… ============================================================================== --- trunk/wagon/src/config/online_migration.xml (original) +++ trunk/wagon/src/config/online_migration.xml Mon Sep 29 15:26:56 2008 @@ -10,6 +10,23 @@ --> <textdomain>online-migration</textdomain> + <proposals config:type="list"> + <proposal> + <label>Distribution Upgrade Settings</label> + <mode>update</mode> + <stage>normal</stage> + <name>wagon_proposal</name> + <enable_skip>no</enable_skip> + + <proposal_modules config:type="list"> + <proposal_module>add-on</proposal_module> + <proposal_module>update</proposal_module> + <proposal_module>packages</proposal_module> + <proposal_module>backup</proposal_module> + </proposal_modules> + </proposal> + </proposals> + <workflows config:type="list"> <workflow> @@ -40,6 +57,12 @@ <execute>wagon_selfupdate</execute> </module> + <module> + <label>Renew Update Stack</label> + <name>suseconfig_after_update</name> + <execute>inst_suseconfig</execute> + </module> +  <module> <label>Get New Update URL</label> @@ -53,10 +76,13 @@ --> <module> <label>Update</label> - <name>online_update</name> - <execute>wagon_you</execute> + <name>wagon_proposal</name> + <execute>inst_proposal</execute> + <proposal>wagon_proposal</proposal> </module> +  + <module> <label>Update</label> <name>suseconfig_after_update</name> Added: trunk/wagon/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Makefile.am?re… ============================================================================== --- trunk/wagon/src/modules/Makefile.am (added) +++ trunk/wagon/src/modules/Makefile.am Mon Sep 29 15:26:56 2008 @@ -0,0 +1,9 @@ +# +# Makefile.am for wagon/src/modules +# + +module_DATA = $(wildcard *.ycp) + +EXTRA_DIST = $(module_DATA) + +include $(top_srcdir)/Makefile.am.common -- 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] r51650 - in /trunk/ntp-client: package/yast2-ntp-client.changes src/ntp-client_proposal.ycp
by visnov＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: visnov Date: Mon Sep 29 15:14:58 2008 New Revision: 51650 URL: http://svn.opensuse.org/viewcvs/yast?rev=51650&view=rev Log: - avoid reading configuration during install (bnc #427712) Modified: trunk/ntp-client/package/yast2-ntp-client.changes trunk/ntp-client/src/ntp-client_proposal.ycp Modified: trunk/ntp-client/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/package/yast2-ntp-cli… ============================================================================== --- trunk/ntp-client/package/yast2-ntp-client.changes (original) +++ trunk/ntp-client/package/yast2-ntp-client.changes Mon Sep 29 15:14:58 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Sep 29 15:13:54 CEST 2008 - visnov(a)suse.cz + +- avoid reading configuration during install (bnc #427712) + +------------------------------------------------------------------- Mon Aug 18 12:26:19 CEST 2008 - mvidner(a)suse.cz - Applied Netconfig patch for fine-grained merging of static and Modified: trunk/ntp-client/src/ntp-client_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/ntp-client_propos… ============================================================================== --- trunk/ntp-client/src/ntp-client_proposal.ycp (original) +++ trunk/ntp-client/src/ntp-client_proposal.ycp Mon Sep 29 15:14:58 2008 @@ -56,6 +56,8 @@ ntp_items = maplist(string server, NtpClient::GetUsedNtpServers(),{ return `item(`id(server), server); }); + // avoid calling Read again (bnc #427712) + NtpClient::config_has_been_read = true; } if( ntp_items == []) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0