Mailing Lists
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2023
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
List overview
Download
YaST Commits
March 2009
----- 2023 -----
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
yast-commit@lists.opensuse.org
20 participants
693 discussions
Start a n
N
ew thread
[yast-commit] r56458 - /trunk/installation/control/control.rnc
by locilka@svn.opensuse.org
31 Mar '09
31 Mar '09
Author: locilka Date: Mon Mar 30 14:26:50 2009 New Revision: 56458 URL:
http://svn.opensuse.org/viewcvs/yast?rev=56458&view=rev
Log: Updated RNC file Modified: trunk/installation/control/control.rnc Modified: trunk/installation/control/control.rnc URL:
http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.rnc…
============================================================================== --- trunk/installation/control/control.rnc (original) +++ trunk/installation/control/control.rnc Mon Mar 30 14:26:50 2009 @@ -81,6 +81,7 @@ | timezone | enable_autologin | runlevel + | debug_deploying additional_kernel_parameters = element additional_kernel_parameters { text } incomplete_translation_treshold = element incomplete_translation_treshold { text } @@ -119,6 +120,7 @@ rle_offer_rulevel_4 = element rle_offer_rulevel_4 { BOOLEAN } default_ntp_setup = element default_ntp_setup { BOOLEAN } enable_kdump = element enable_kdump { BOOLEAN } +debug_deploying = element debug_deploying { BOOLEAN } save_instsys_content = element save_instsys_content { LIST, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r56457 - in /trunk/installation: VERSION control/control.openSUSE.xml package/yast2-installation.changes src/clients/inst_deploy_image.ycp src/modules/ImageInstallation.ycp
by locilka@svn.opensuse.org
31 Mar '09
31 Mar '09
Author: locilka Date: Mon Mar 30 14:25:11 2009 New Revision: 56457 URL:
http://svn.opensuse.org/viewcvs/yast?rev=56457&view=rev
Log: - Fixing reevaluation of packages to remove, install and/or upgrade after images are deployed during first stage (bnc #489448). - 2.18.12 Modified: trunk/installation/VERSION trunk/installation/control/control.openSUSE.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_deploy_image.ycp trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/VERSION URL:
http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=56457&r…
============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Mar 30 14:25:11 2009 @@ -1 +1 @@ -2.18.11 +2.18.12 Modified: trunk/installation/control/control.openSUSE.xml URL:
http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope…
============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon Mar 30 14:25:11 2009 @@ -170,6 +170,9 @@ <!-- bnc #431259 --> <default_ntp_setup config:type="boolean">true</default_ntp_setup> + + <!-- to debug deploying, set to 'true' --> + <debug_deploying config:type="boolean">false</debug_deploying> </globals> <software> 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 Mon Mar 30 14:25:11 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Mar 30 14:20:57 CEST 2009 - locilka(a)suse.cz + +- Fixing reevaluation of packages to remove, install and/or upgrade + after images are deployed during first stage (bnc #489448). +- 2.18.12 + +------------------------------------------------------------------- Fri Mar 27 18:15:15 CET 2009 - locilka(a)suse.cz - Added new globals->ac_redraw_and_ignore control file item Modified: trunk/installation/src/clients/inst_deploy_image.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_de…
============================================================================== --- trunk/installation/src/clients/inst_deploy_image.ycp (original) +++ trunk/installation/src/clients/inst_deploy_image.ycp Mon Mar 30 14:25:11 2009 @@ -338,7 +338,10 @@ PackageCallbacks::RestorePreviousProgressCallbacks(); // Restore the states stored by StoreAllChanges() -ImageInstallation::RestoreAllChanges(); +if (ImageInstallation::RestoreAllChanges() != true) { + y2warning ("Aborting..."); + return `abort; +} // BNC #436842 - debug feature in control file if (ProductFeatures::GetBooleanFeature("globals", "debug_deploying") == true) { Modified: trunk/installation/src/modules/ImageInstallation.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageIn…
============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Mon Mar 30 14:25:11 2009 @@ -29,6 +29,7 @@ import "ProductControl"; import "ProductFeatures"; import "Packages"; +import "PackagesUI"; textdomain "installation"; @@ -1098,7 +1099,7 @@ boolean ret = nil; - // There are some installed + // There are some installed (matching the same arch, version, and name) if (size (resolvable_properties) > 0) { y2milestone ("Resolvable type: %1, name: %2 already installed", one_type, one_object["name"]:"-x-"); // Let's keep the installed version @@ -1118,7 +1119,12 @@ return ret; } - global void RestoreAllChanges () { + /** + * Restores packages statuses from 'objects_state': Selects packages for removal, installation, upgrade. + * + * @return boolean if successful + */ + global boolean RestoreAllChanges () { integer nr_steps = 4 * size (all_supported_types); string id = "restoring_user_prefs"; @@ -1139,6 +1145,11 @@ if (generic_set_progress != nil) generic_set_progress (id, nil); + // List of all packages selected for installation (just names) + list <string> selected_for_installation_pkgnames = maplist (map one_resolvable, objects_state[one_type, "install"]:[], { + return one_resolvable["name"]:""; + }); + // All packages selected to be installed // [ $[ "arch" : ... , "name" : ... , "version" : ... ], ... ] list <map <string, string> > selected_for_installation = maplist (map one_resolvable, objects_state[one_type, "install"]:[], { @@ -1162,9 +1173,17 @@ // Already installed resolvable but not in list of resolvables to be installed if (! contains (selected_for_installation, one_already_installed_resolvable)) { - y2milestone ("Removing type: %1, name: %2 version: %3", - one_type, one_resolvable["name"]:"-x-", one_resolvable["version"]:"-x-"); - Pkg::ResolvableRemove (one_resolvable["name"]:"-x-", one_type); + // BNC #489448: Do not remove package which is installed in different version and/or arch + // It will be upgraded later + if (contains (selected_for_installation_pkgnames, one_resolvable["name"]:"-x-")) { + y2milestone ("Not Removing type: %1, name: %2 version: %3", + one_type, one_resolvable["name"]:"-x-", one_resolvable["version"]:"-x-"); + // Package is installed or selected but should not be, remove it + } else { + y2milestone ("Removing type: %1, name: %2 version: %3", + one_type, one_resolvable["name"]:"-x-", one_resolvable["version"]:"-x-"); + Pkg::ResolvableRemove (one_resolvable["name"]:"-x-", one_type); + } } }); @@ -1182,6 +1201,43 @@ // Free the memory objects_state = $[]; + + // Return 'true' if YaST can solve deps. automatically + if (Pkg::PkgSolve (true) == true) { + y2milestone ("Dependencies solved atomatically"); + return true; + } + + // Error message + Report::Error (_("Installation was unable to solve package dependecies automatically. +Package manager will be opened for you to solve them manually.")); + + boolean ret = false; + + // BNC #Trying to solve deps. manually + while (true) { + y2warning ("Cannot solve dependecies automatically, opening Packages UI"); + symbol diaret = PackagesUI::RunPackageSelector ($["enable_repo_mgr":false, "mode":`summaryMode]); + y2milestone ("RunPackageSelector returned %1", diaret); + + // User didn't solve the deps manually + if (diaret == `cancel) { + ret = false; + if (Popup::ConfirmAbort (`unusable)) { + y2warning ("User abort..."); + break; + } + // Aborting not confirmed, next round + continue; + // Solved! (somehow) + } else { + ret = true; + break; + } + } + + y2milestone ("Dependencies solved: %1", ret); + return ret; } // <-- Storing and restoring states -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r56456 - in /trunk/installation: control/control.SLED.xml control/control.openSUSE.xml control/control.rnc package/yast2-installation.changes src/clients/inst_automatic_configuration.ycp
by locilka@svn.opensuse.org
30 Mar '09
30 Mar '09
Author: locilka Date: Mon Mar 30 10:38:05 2009 New Revision: 56456 URL:
http://svn.opensuse.org/viewcvs/yast?rev=56456&view=rev
Log: - Added new globals->ac_redraw_and_ignore control file item (openSUSE and SLED) that ignores if AC UI is missing and just redraws it. An error is still reported in case of missing Wizard widget (bnc #487565). Modified: trunk/installation/control/control.SLED.xml trunk/installation/control/control.openSUSE.xml trunk/installation/control/control.rnc trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_automatic_configuration.ycp Modified: trunk/installation/control/control.SLED.xml URL:
http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE…
============================================================================== --- trunk/installation/control/control.SLED.xml (original) +++ trunk/installation/control/control.SLED.xml Mon Mar 30 10:38:05 2009 @@ -93,6 +93,15 @@ <module>restore_settings</module> </autoconfiguration_enabled_modules> + <!-- + BNC #487565, Some AC steps might create their own UI (rpmcopy, for instance) + and AC should just recreate its UI without reporting an error. + Each ac_item here matches inst_* resp. *_proposal from automatic_configuration->ac_item + --> + <ac_redraw_and_ignore config:type="list"> + <ac_item>inst_rpmcopy_secondstage</ac_item> + </ac_redraw_and_ignore> + <!-- Configuration for inst_automatic_configuration script --> <automatic_configuration config:type="list"> <!-- Modified: trunk/installation/control/control.openSUSE.xml URL:
http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope…
============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon Mar 30 10:38:05 2009 @@ -94,6 +94,15 @@ <!-- FATE #303395, Kexec instead of reboot (default 'false') --> <kexec_reboot config:type="boolean">true</kexec_reboot> + <!-- + BNC #487565, Some AC steps might create their own UI (rpmcopy, for instance) + and AC should just recreate its UI without reporting an error. + Each ac_item here matches inst_* resp. *_proposal from automatic_configuration->ac_item + --> + <ac_redraw_and_ignore config:type="list"> + <ac_item>inst_rpmcopy_secondstage</ac_item> + </ac_redraw_and_ignore> + <!-- Configuration for inst_automatic_configuration script --> <automatic_configuration config:type="list"> <!-- Modified: trunk/installation/control/control.rnc URL:
http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.rnc…
============================================================================== --- trunk/installation/control/control.rnc (original) +++ trunk/installation/control/control.rnc Mon Mar 30 10:38:05 2009 @@ -70,6 +70,7 @@ | copy_to_system | autoconfiguration_enabled_modules | automatic_configuration + | ac_redraw_and_ignore | displaymanager_shutdown | enable_kdump | polkit_default_privs @@ -147,6 +148,11 @@ element module { text }+ } +ac_redraw_and_ignore = element ac_redraw_and_ignore { + LIST, + element ac_item { text }+ +} + automatic_configuration = element automatic_configuration { LIST, element ac_step { 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 Mon Mar 30 10:38:05 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Mar 27 18:15:15 CET 2009 - locilka(a)suse.cz + +- Added new globals->ac_redraw_and_ignore control file item + (openSUSE and SLED) that ignores if AC UI is missing and just + redraws it. An error is still reported in case of missing Wizard + widget (bnc #487565). + +------------------------------------------------------------------- Thu Mar 19 14:14:34 CET 2009 - locilka(a)suse.cz - Continuing on Repair integration. Modified: trunk/installation/src/clients/inst_automatic_configuration.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_au…
============================================================================== --- trunk/installation/src/clients/inst_automatic_configuration.ycp (original) +++ trunk/installation/src/clients/inst_automatic_configuration.ycp Mon Mar 30 10:38:05 2009 @@ -57,6 +57,7 @@ map <string, any> globals_features = ProductFeatures::GetSection ("globals"); list <map> acc = (list <map>) globals_features["automatic_configuration"]:[]; + list <string> acc_ignore = (list <string>) globals_features["ac_redraw_and_ignore"]:[]; if (acc == nil || acc == []) { y2warning ("No AC defined (%1), skipping...", acc); @@ -189,8 +190,22 @@ integer current_sub_step = 0; integer current_step = 0; string current_client = ""; + boolean ac_redraw_and_ignore = nil; + + void DumpACUIError () { + y2error ("AC progress widgets missing"); + y2warning ("---------------------- UI DUMP ----------------------"); + UI::DumpWidgetTree(); + y2warning ("---------------------- UI DUMP ----------------------"); + } + + string last_client = nil; void NextStep () { + // If a Progress is missing, it's recreated and an error is reported + if (last_client == nil) last_client = current_client; + ac_redraw_and_ignore = (last_client == nil ? false : contains (acc_ignore, last_client)); + current_sub_step = current_sub_step + 1; current_step = current_step + 1; @@ -198,18 +213,26 @@ if (! UI::WidgetExists (`id (`next)) && ! UI::WidgetExists (`id (`back)) && ! UI::WidgetExists (`id (`abort))) { y2error ("There is no Wizard dialog open! Creating one..."); Wizard::OpenNextBackStepsDialog(); + DumpACUIError(); InstError::ShowErrorPopupWithLogs ( - sformat (_("An error has occured while calling '%1' AC script."), current_client) + sformat (_("An error has occured while calling '%1' AC script."), last_client) ); } // BNC #483211: It might happen that some client changes the dialog if (! UI::WidgetExists (`id ("one_set_progress")) || ! UI::WidgetExists (`id ("autoconf_progress"))) { - y2error ("There is no Automatic Configuration dialog, adjusting the current one..."); + if (ac_redraw_and_ignore == true) { + y2warning ("There is no Automatic Configuration dialog, adjusting the current one... (ignored)"); + } else { + DumpACUIError(); + y2error ("There is no Automatic Configuration dialog, adjusting the current one..."); + InstError::ShowErrorPopupWithLogs ( + sformat (_("An error has occured while calling '%1' AC script."), last_client) + ); + } + + // Redraw after showing an error SetWizardContents(); - InstError::ShowErrorPopupWithLogs ( - sformat (_("An error has occured while calling '%1' AC script."), current_client) - ); } if (UI::WidgetExists (`id ("one_set_progress"))) @@ -247,6 +270,7 @@ Progress::set (progress_before); y2milestone ("Script %1 returned %2", one_script, result); + last_client = one_script; }); } @@ -271,15 +295,9 @@ Progress::set (progress_before); y2milestone ("Script %1 returned %2", one_proposal, result); + last_client = one_proposal; }); - // TODO: handle errors, warnings ... - // foreach (string one_proposal, proposals_to_call, { - // y2milestone ("Calling script %1 MakeProposal", one_proposal); - // any result = WFM::CallFunction (one_proposal, ["Description", $[ "AutomaticConfiguration":true ]]); - // y2milestone ("Script %1 returned %2", one_proposal, result); - //}); - foreach (string one_proposal, proposals_to_call, { y2milestone ("Calling script %1 Write", one_proposal); current_client = one_proposal; @@ -294,6 +312,7 @@ ); y2milestone ("Script %1 returned %2", one_proposal, result); + last_client = one_proposal; }); } @@ -305,6 +324,9 @@ SetWizardContents(); + // items per step + integer nr_of_items = 0; + foreach (map one_autoconf_call, proposal_scripts_to_call, { if (one_autoconf_call["icon"]:"" != "") { Wizard::SetTitleIcon (one_autoconf_call["icon"]:""); @@ -315,29 +337,11 @@ string type = one_autoconf_call["type"]:""; - integer nr_of_steps = ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[])); + nr_of_items = ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[])); string label = one_autoconf_call["label"]:_("Automatic configuration..."); y2milestone ("Steps: %1, Label: %2", nr_of_steps, label); - // reset the faster prgress - current_sub_step = 0; - if (UI::WidgetExists (`id ("rp_one_set_progress"))) { - UI::ReplaceWidget (`id ("rp_one_set_progress"), - `ProgressBar ( - `id ("one_set_progress"), - label, - nr_of_steps, - 0 - ) - ); - } else { - y2error ("Widget rp_one_set_progress doesn't exist! Cannot provide useful progress..."); - y2warning ("---------------------- UI DUMP ----------------------"); - UI::DumpWidgetTree(); - y2warning ("---------------------- UI DUMP ----------------------"); - } - switch (type) { case "scripts": CallScripts (one_autoconf_call["items"]:[]); @@ -351,12 +355,9 @@ y2milestone ("automatic_configuration finished"); -// Wizard::SetContents ( -// _("Automatic Configuration"), -// `Label (_("Finishing configuration...")), -// "", -// false, false -// ); + // Set to 100% + UI::ChangeWidget (`id ("one_set_progress"), `Value, nr_of_items); + UI::ChangeWidget (`id ("autoconf_progress"), `Value, nr_of_steps); if (test_mode) Wizard::CloseDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r56455 - /trunk/storage/libstorage/src/ProcMounts.cc
by aschnell@svn.opensuse.org
28 Mar '09
28 Mar '09
Author: aschnell Date: Fri Mar 27 21:10:35 2009 New Revision: 56455 URL:
http://svn.opensuse.org/viewcvs/yast?rev=56455&view=rev
Log: - shorted coding Modified: trunk/storage/libstorage/src/ProcMounts.cc Modified: trunk/storage/libstorage/src/ProcMounts.cc URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcMount…
============================================================================== --- trunk/storage/libstorage/src/ProcMounts.cc (original) +++ trunk/storage/libstorage/src/ProcMounts.cc Fri Mar 27 21:10:35 2009 @@ -126,12 +126,9 @@ co[dev].fs = "swap"; getline( mounts, line ); } - map<string,FstabEntry>::const_iterator i = co.begin(); - while( i!=co.end() ) - { - y2mil( "co:[" << i->first << "]-->" << i->second ); - ++i; - } + + for (map<string, FstabEntry>::const_iterator it = co.begin(); it != co.end(); ++it) + y2mil("co:[" << it->first << "]-->" << it->second); } string -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r56454 - /trunk/storage/package/yast2-storage.changes
by kmachalkova@svn.opensuse.org
28 Mar '09
28 Mar '09
Author: kmachalkova Date: Fri Mar 27 17:59:06 2009 New Revision: 56454 URL:
http://svn.opensuse.org/viewcvs/yast?rev=56454&view=rev
Log: changes Modified: trunk/storage/package/yast2-storage.changes Modified: trunk/storage/package/yast2-storage.changes URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch…
============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Mar 27 17:59:06 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 27 17:55:41 CET 2009 - kmachalkova(a)suse.cz + +- Avoid throwing 'no widget with ID foo' exceptions in format/mount + dialog (bnc#483789) + +------------------------------------------------------------------- Wed Mar 25 16:58:10 CET 2009 - aschnell(a)suse.de - fixed commit order for partitions that are resized and deleted -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r56453 - in /trunk/storage/storage/src/include: custom_part_lib.ycp ep-dialogs.ycp
by kmachalkova@svn.opensuse.org
28 Mar '09
28 Mar '09
Author: kmachalkova Date: Fri Mar 27 17:49:56 2009 New Revision: 56453 URL:
http://svn.opensuse.org/viewcvs/yast?rev=56453&view=rev
Log: Avoid throwing 'no widget with ID foo' exceptions (#483789) + moved enabling/disabling widgets away from giant HandlePartWidgetChanges func. Modified: trunk/storage/storage/src/include/custom_part_lib.ycp trunk/storage/storage/src/include/ep-dialogs.ycp Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust…
============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Fri Mar 27 17:49:56 2009 @@ -813,25 +813,6 @@ // format partition new["format"] = format; - if( UI::WidgetExists( `id(`fs) )) - { - UI::ChangeWidget( `id(`fs), `Enabled, format ); - } - if( UI::WidgetExists( `id(`fs_options) )) - { - UI::ChangeWidget( `id(`fs_options), `Enabled, - format && selected_fs[`options]:[] != [] ); - } - if( UI::WidgetExists( `id(`crypt_fs) )) - { - UI::ChangeWidget( `id(`crypt_fs), `Enabled, - selected_fs[`crypt]:true ); - } - if( UI::WidgetExists( `id(`fsid_point) )) - { - UI::ChangeWidget( `id(`fsid_point), `Enabled, !format); - } - if( old_format != format ) { symbol dfs = `unknown; Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d…
============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Fri Mar 27 17:49:56 2009 @@ -32,6 +32,12 @@ //retrieve all filesystems map<symbol, map<symbol, any> > all_filesystems = FileSystems::GetAllFileSystems(true, true); + void ChangeWidgetIfExists( symbol wid, symbol property, any value) + { + if ( UI::WidgetExists(`id(wid)) ) + UI::ChangeWidget(`id(wid), property, value); + } + list <string> ProposeMountpoints( symbol used_fs, string current_mp ) { map <symbol, any> fs_data = all_filesystems[used_fs]: $[]; @@ -50,6 +56,14 @@ } } + // disable Options p.b. if no fs options can be set + // disable Encrypt box if fs doesn't support encryption + void EnableDisableFsOpts( symbol used_fs ) + { + map <symbol, any> fs_data = all_filesystems[used_fs]: $[]; + UI::ChangeWidget(`id(`fs_options), `Enabled, fs_data[`options]:[] != []); + ChangeWidgetIfExists(`crypt_fs, `Enabled, fs_data[`crypt]:true); + } boolean do_format = data["format"]:false; symbol used_fs = data["used_fs"]:`unknown; @@ -85,7 +99,6 @@ return true; } - /* MiniWorkflowStepPartitionSize data: $["create":true, "cyl_size":8225280, @@ -179,8 +192,15 @@ UI::ChangeWidget(`id(`format), `Value, do_format ? `do_format : `do_not_format); UI::ChangeWidget(`id(`do_format_attachment), `Enabled, do_format); - UI::ChangeWidget(`id(`crypt_fs), `Value, crypt_fs); - UI::ChangeWidget(`id(`do_not_format_attachment), `Enabled, !do_format); + //not there in RAID/LVM/loop configuration (#483789) + ChangeWidgetIfExists( `do_not_format_attachment, `Enabled, !do_format ); + + if( do_format) + EnableDisableFsOpts(used_fs); + + //not there on s390s + ChangeWidgetIfExists( `crypt_fs, `Value, crypt_fs ); + UI::ChangeWidget(`id(`mount), `Value, do_mount ? `do_mount : `do_not_mount); UI::ChangeWidget(`id(`do_mount_attachment), `Enabled, do_mount); UI::ChangeWidget(`id(`mount_point), `Value, mount); @@ -260,7 +280,8 @@ data["used_fs"] = (symbol) UI::QueryWidget(`id(`fs), `Value); UI::ChangeWidget(`id(`do_format_attachment), `Enabled, true); - UI::ChangeWidget(`id(`do_not_format_attachment), `Enabled, false); + ChangeWidgetIfExists(`do_not_format_attachment, `Enabled, false); + EnableDisableFsOpts( data["used_fs"]:`none); UI::SetFocus(`id(`fs)); MiniWorkflow::SetLastStep(!AskPassword()); break; @@ -268,7 +289,7 @@ case `do_not_format: do_format = (boolean) UI::QueryWidget(`id(`do_format), `Value); UI::ChangeWidget(`id(`do_format_attachment), `Enabled, false); - UI::ChangeWidget(`id(`do_not_format_attachment), `Enabled, true); + ChangeWidgetIfExists(`do_not_format_attachment, `Enabled, true); MiniWorkflow::SetLastStep(!AskPassword()); break; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r56452 - in /branches/tmp/mzugec/python-hd: ./ Makefile pyhd.c
by mzugec@svn.opensuse.org
28 Mar '09
28 Mar '09
Author: mzugec Date: Fri Mar 27 17:08:07 2009 New Revision: 56452 URL:
http://svn.opensuse.org/viewcvs/yast?rev=56452&view=rev
Log: initial commit Added: branches/tmp/mzugec/python-hd/ branches/tmp/mzugec/python-hd/Makefile branches/tmp/mzugec/python-hd/pyhd.c Added: branches/tmp/mzugec/python-hd/Makefile URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/mzugec/python-hd/Makefile…
============================================================================== --- branches/tmp/mzugec/python-hd/Makefile (added) +++ branches/tmp/mzugec/python-hd/Makefile Fri Mar 27 17:08:07 2009 @@ -0,0 +1,6 @@ +CC = gcc +CCFLAGS = -shared -I/usr/include/python2.6/ -L/usr/lib -lhd $(python-config --ldflags) + +pyhd.so: pyhd.c + ${CC} ${CCFLAGS} pyhd.c -o $@ + Added: branches/tmp/mzugec/python-hd/pyhd.c URL:
http://svn.opensuse.org/viewcvs/yast/branches/tmp/mzugec/python-hd/pyhd.c?r…
============================================================================== --- branches/tmp/mzugec/python-hd/pyhd.c (added) +++ branches/tmp/mzugec/python-hd/pyhd.c Fri Mar 27 17:08:07 2009 @@ -0,0 +1,61 @@ +#include <Python.h> +#include <stdio.h> +#include <hd.h> // libhd + +static PyObject * pyhd_system(PyObject *self, PyObject *args) +{ + const char *command; + int sts; + + if (!PyArg_ParseTuple(args, "s", &command)) + return NULL; + sts = system(command); + return Py_BuildValue("i", sts); +} + +static PyObject * pyhd_probe(PyObject *self, PyObject *args) +{ + const char *command; + int sts; + + if (!PyArg_ParseTuple(args, "s", &command)) + return NULL; + sts = printf("Probing : %s\n", command); + return Py_BuildValue("i", sts); +} + +static PyMethodDef HwinfoMethods[] = { + {"system", pyhd_system, METH_VARARGS, "Execute a shell command."}, + {"probe", pyhd_probe, METH_VARARGS, "Probe devices."}, + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + +static PyObject *PyhdError; + +PyMODINIT_FUNC initpyhd(void) +{ + PyObject *m; + + m = Py_InitModule("pyhd", HwinfoMethods); + if (m == NULL) + return; + + PyhdError = PyErr_NewException("spam.error", NULL, NULL); + Py_INCREF(PyhdError); + PyModule_AddObject(m, "error", PyhdError); +} + + +int main(int argc, char *argv[]) +{ + /* Pass argv[0] to the Python interpreter */ + Py_SetProgramName(argv[0]); + + /* Initialize the Python interpreter. Required. */ + Py_Initialize(); + + /* Add a static module */ + initpyhd(); + + Py_Finalize(); +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r56451 - /trunk/storage/libstorage/src/Dasd.cc
by aschnell@svn.opensuse.org
28 Mar '09
28 Mar '09
Author: aschnell Date: Fri Mar 27 16:56:17 2009 New Revision: 56451 URL:
http://svn.opensuse.org/viewcvs/yast?rev=56451&view=rev
Log: - renamed variable - delete object Modified: trunk/storage/libstorage/src/Dasd.cc Modified: trunk/storage/libstorage/src/Dasd.cc URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?r…
============================================================================== --- trunk/storage/libstorage/src/Dasd.cc (original) +++ trunk/storage/libstorage/src/Dasd.cc Fri Mar 27 16:56:17 2009 @@ -556,9 +556,9 @@ string cmd_line = DASDFMTBIN " -Y -P 4 -b 4096 -y -m 1 -d cdl " + boost::join(devs, " "); y2mil("cmdline:" << cmd_line); CallbackProgressBar cb = getStorage()->getCallbackProgressBarTheOne(); - ProgressBar* sb = new DasdfmtProgressBar( cb ); + ProgressBar* progressbar = new DasdfmtProgressBar( cb ); SystemCmd cmd; - cmd.setOutputProcessor( sb ); + cmd.setOutputProcessor(progressbar); if( execCheckFailed( cmd, cmd_line ) ) { ret = DASD_DASDFMT_FAILED; @@ -574,6 +574,7 @@ ds->removeFromMemory(); } } + delete progressbar; } return( ret ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r56450 - /trunk/storage/libstorage/src/Volume.cc
by aschnell@svn.opensuse.org
28 Mar '09
28 Mar '09
Author: aschnell Date: Fri Mar 27 16:55:52 2009 New Revision: 56450 URL:
http://svn.opensuse.org/viewcvs/yast?rev=56450&view=rev
Log: - renamed variable Modified: trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Volume.cc URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc…
============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Fri Mar 27 16:55:52 2009 @@ -724,7 +724,7 @@ { string cmd; string params; - ProgressBar* p = NULL; + ProgressBar* progressbar = NULL; CallbackProgressBar cb = cont->getStorage()->getCallbackProgressBarTheOne(); switch( fs ) @@ -733,12 +733,12 @@ case EXT3: cmd = "/sbin/mke2fs"; params = (fs==EXT2) ? "-v" : "-j -v"; - p = new Mke2fsProgressBar( cb ); + progressbar = new Mke2fsProgressBar( cb ); break; case REISERFS: cmd = "/sbin/mkreiserfs"; params = "-f -f"; - p = new ReiserProgressBar( cb ); + progressbar = new ReiserProgressBar( cb ); break; case VFAT: cmd = "/sbin/mkdosfs"; @@ -777,7 +777,7 @@ } cmd += quote(mountDevice()); SystemCmd c; - c.setOutputProcessor( p ); + c.setOutputProcessor(progressbar); c.execute( cmd ); if( c.retcode()!=0 ) { @@ -785,7 +785,7 @@ setExtError( c ); } } - delete p; + delete progressbar; } if( ret==0 && fs==EXT3 ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r56449 - in /trunk/storage/libstorage/src: ProcPart.cc ProcPart.h Storage.cc
by aschnell@svn.opensuse.org
28 Mar '09
28 Mar '09
Author: aschnell Date: Fri Mar 27 16:48:22 2009 New Revision: 56449 URL:
http://svn.opensuse.org/viewcvs/yast?rev=56449&view=rev
Log: - remember onlt size not complete line in ProcPart - cleanup Modified: trunk/storage/libstorage/src/ProcPart.cc trunk/storage/libstorage/src/ProcPart.h trunk/storage/libstorage/src/Storage.cc Modified: trunk/storage/libstorage/src/ProcPart.cc URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcPart.…
============================================================================== --- trunk/storage/libstorage/src/ProcPart.cc (original) +++ trunk/storage/libstorage/src/ProcPart.cc Fri Mar 27 16:48:22 2009 @@ -3,11 +3,11 @@ Textdomain "storage" */ -#include <sstream> #include "y2storage/AppUtil.h" #include "y2storage/Regex.h" #include "y2storage/StorageTmpl.h" +#include "y2storage/AsciiFile.h" #include "y2storage/ProcPart.h" @@ -16,69 +16,59 @@ using namespace std; -ProcPart::ProcPart() : AsciiFile( "/proc/partitions" ) + ProcPart::ProcPart() { - y2mil( "numLines " << numLines() ); - for( unsigned i=0; i<numLines(); i++ ) - { - y2mil( "line " << (i+1) << " is \"" << (*this)[i] << "\"" ); - string tmp = extractNthWord( 3, (*this)[i] ); - if( !tmp.empty() && tmp!="name" ) - { - co[tmp] = i; - } - } + reload(); } -bool -ProcPart::getInfo( const string& Dev, unsigned long long& SizeK, - unsigned long& Major, unsigned long& Minor ) const + + void + ProcPart::reload() { - bool ret = false; - map<string,int>::const_iterator i = co.find( devName(Dev) ); - if( i != co.end() ) + data.clear(); + + AsciiFile file("/proc/partitions"); + const vector<string>& lines = file.lines(); + + for (vector<string>::const_iterator it = lines.begin(); it != lines.end(); ++it) { - extractNthWord( 0, (*this)[i->second] ) >> Major; - extractNthWord( 1, (*this)[i->second] ) >> Minor; - extractNthWord( 2, (*this)[i->second] ) >> SizeK; - ret = true; + string device = extractNthWord(3, *it); + if (!device.empty() && device != "name") + { + unsigned long long sizeK; + extractNthWord(2, *it) >> sizeK; + data[device] = sizeK; + } } - return( ret ); } -bool -ProcPart::getSize( const string& Dev, unsigned long long& SizeK ) const + + bool + ProcPart::getSize(const string& device, unsigned long long& sizeK) const { - bool ret = false; - map<string,int>::const_iterator i = co.find( devName(Dev) ); - if( i != co.end() ) + bool ret = false; + map<string, unsigned long long>::const_iterator i = data.find(undevDevice(device)); + if (i != data.end()) { - extractNthWord( 2, (*this)[i->second] ) >> SizeK; - ret = true; + sizeK = i->second; + ret = true; } - y2mil( "dev:" << Dev << " ret:" << ret << " Size:" << (ret?SizeK:0) ); - return( ret ); + y2mil("dev:" << device << " ret:" << ret << " sizeK:" << (ret ? sizeK : 0)); + return ret; } -string -ProcPart::devName( const string& Dev ) - { - return( undevDevice( Dev )); - } -list<string> -ProcPart::getMatchingEntries( const string& regexp ) const + list<string> + ProcPart::getMatchingEntries(const string& regexp) const { - Regex reg( "^" + regexp + "$" ); - list<string> ret; - for( map<string,int>::const_iterator i=co.begin(); i!=co.end(); i++ ) + Regex reg("^" + regexp + "$"); + list<string> ret; + for (map<string, unsigned long long>::const_iterator i = data.begin(); i != data.end(); ++i) { - if( reg.match( i->first )) - { - ret.push_back( i->first ); - } + if (reg.match(i->first)) + ret.push_back(i->first); } - return( ret ); + return ret; } } Modified: trunk/storage/libstorage/src/ProcPart.h URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcPart.…
============================================================================== --- trunk/storage/libstorage/src/ProcPart.h (original) +++ trunk/storage/libstorage/src/ProcPart.h Fri Mar 27 16:48:22 2009 @@ -1,28 +1,38 @@ #ifndef PROC_PART_H #define PROC_PART_H + #include <string> #include <list> #include <map> -#include "y2storage/AsciiFile.h" namespace storage { + using std::string; + using std::list; + using std::map; + -class ProcPart : public AsciiFile + class ProcPart { public: + ProcPart(); - bool getInfo( const string& Dev, unsigned long long& SizeK, - unsigned long& Major, unsigned long& Minor ) const; - bool getSize( const string& Dev, unsigned long long& SizeK ) const; - std::list<string> getMatchingEntries( const string& regexp ) const; + + void reload(); + + bool getSize(const string& device, unsigned long long& sizeK) const; + + list<string> getMatchingEntries(const string& regexp) const; + protected: - static string devName( const string& Dev ); - std::map<string,int> co; + + map<string, unsigned long long> data; + }; } + #endif Modified: trunk/storage/libstorage/src/Storage.cc URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c…
============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Fri Mar 27 16:48:22 2009 @@ -199,22 +199,21 @@ } void Storage::detectObjects() - { - ProcPart* ppart = new ProcPart; - detectDisks( *ppart ); +{ + ProcPart ppart; + detectDisks(ppart); if( instsys() ) { DmraidCo::activate( true ); MdCo::activate( true, tmpDir() ); LvmVg::activate( true ); - delete ppart; - ppart = new ProcPart; + ppart.reload(); } detectMds(); - detectDmraid( *ppart ); - detectDmmultipath( *ppart ); + detectDmraid(ppart); + detectDmmultipath(ppart); detectLvmVgs(); - detectDm( *ppart ); + detectDm(ppart); LvmVgPair p = lvgPair(); y2mil( "p length:" << p.length() ); @@ -235,7 +234,7 @@ else { fstab = new EtcFstab( "/etc", isRootMounted() ); - detectLoops( *ppart ); + detectLoops(ppart); ProcMounts pm( this ); if( !instsys() ) detectNfs( pm ); @@ -251,7 +250,6 @@ rm.execute(MDADMBIN " --stop " + quote("/dev/" + extractNthWord(0, c.getLine(i)))); } } - delete ppart; } void Storage::deleteClist( CCont& co ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
← Newer
1
...
4
5
6
7
8
9
10
...
70
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
Results per page:
10
25
50
100
200