January 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55115 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_finish.ycp src/include/scr_switch_debugger.ycp src/modules/InstError.ycp
by locilka＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: locilka Date: Wed Jan 28 14:35:57 2009 New Revision: 55115 URL: http://svn.opensuse.org/viewcvs/yast?rev=55115&view=rev Log: - Added new InstError module for unified reporting of errors during installation. Added: trunk/installation/src/modules/InstError.ycp Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_finish.ycp trunk/installation/src/include/scr_switch_debugger.ycp 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 Jan 28 14:35:57 2009 @@ -1,9 +1,15 @@ ------------------------------------------------------------------- +Wed Jan 28 14:33:09 CET 2009 - locilka(a)suse.cz + +- Added new InstError module for unified reporting of errors + during installation. +- 2.18.3 + +------------------------------------------------------------------- Tue Jan 27 17:13:57 CET 2009 - locilka(a)suse.cz - Added test for checking free space when SCR switch fails (bnc #460477). -- 2.18.3 ------------------------------------------------------------------- Mon Jan 26 13:58:00 CET 2009 - locilka(a)suse.cz Modified: trunk/installation/src/clients/inst_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_fi… ============================================================================== --- trunk/installation/src/clients/inst_finish.ycp (original) +++ trunk/installation/src/clients/inst_finish.ycp Wed Jan 28 14:35:57 2009 @@ -28,6 +28,7 @@ import "GetInstArgs"; import "ProductFeatures"; import "SlideShow"; + import "InstError"; // added for fate# 303395 import "Directory"; @@ -37,6 +38,17 @@ boolean test_mode = false; + void ReportClientError (string client_error_text) { + // get the latest errors + map cmd = (map) SCR::Execute (.local.bash_output, "tail -n 200 /var/log/YaST2/y2log | grep ' <$3\|5$> '"); + + InstError::ShowErrorPopUp ( + _("Installation Error"), + client_error_text, + (cmd["exit"]:-1 == 0 && cmd["stdout"]:"" != "" ? cmd["stdout"]:"" : nil) + ); + } + if (size (WFM::Args()) > 0 && is (WFM::Args(0), string)) { y2milestone ("Args: %1", WFM::Args()); if (WFM::Args(0) == "test") @@ -237,6 +249,7 @@ if (info == nil) { y2error ("Client %1 returned invalid data", s); + ReportClientError (sformat ("Client %1 returned invalid data.", s)); return nil; } Modified: trunk/installation/src/include/scr_switch_debugger.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/scr_swi… ============================================================================== --- trunk/installation/src/include/scr_switch_debugger.ycp (original) +++ trunk/installation/src/include/scr_switch_debugger.ycp Wed Jan 28 14:35:57 2009 @@ -114,7 +114,7 @@ "/var/log/YaST2/y2log", "http://bugzilla.novell.com/", "/var/log/YaST2/", - // link to the Yast Bug Reporting HOWT + // link to the Yast Bug Reporting HOWTO // for translators: use the localized page for your language if it exists, // check the combo box "In other laguages" on top of the page _("http://en.opensuse.org/Bugs/YaST") @@ -331,7 +331,7 @@ _("Checking for free space in the %1 directory: %2"), partition, // linked to the text above (sometimes replaces the '%2') - (free_space < 0 ? _("Unable to find out"):String::FormatSize (free_space)), + (free_space < 0 ? _("Unable to find out"):String::FormatSize (free_space)) ), this_test ); Added: trunk/installation/src/modules/InstError.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstErr… ============================================================================== --- trunk/installation/src/modules/InstError.ycp (added) +++ trunk/installation/src/modules/InstError.ycp Wed Jan 28 14:35:57 2009 @@ -0,0 +1,72 @@ +/** + * File: modules/InstError.ycp + * Package: Installation + * Summary: Module for reporting installation errors + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * + * $Id$ + * + * This module provides unified interface for reporting + * installation errors. + */ + +{ + textdomain "installation"; + module "InstError"; + + import "Icon"; + import "Label"; + + global void ShowErrorPopUp (string heading, string error_text, string details) { + boolean success = UI::OpenDialog (`VBox ( + `Left (`HBox ( + `HSquash (`MarginBox (0.5, 0.2, Icon::Error())), + `Heading (heading) + )), + `MarginBox ( + 1, 0.5, `VBox ( + `Left (`Label (error_text)), + //`VSpacing (1), + `Left (details == nil ? + `Label (sformat ( + // TRANSLATORS: part of an error message + // // %1 - logfile, possibly with errors + _("More information can be found near the end of the '%1' file."), + "/var/log/YaST2/y2log" + )) + : + `MinHeight (8, `RichText (`opt(`plainText), details)) + ), + //`VSpacing (1), + `Left (`Label (sformat ( + // TRANSLATORS: part of an error message + // %1 - link to our bugzilla + // %2 - directory where YaST logs are stored + // %3 - link to the Yast Bug Reporting HOWTO Web page + _("This is worth reporting a bug at %1. +Please, attach also all YaST logs stored in the '%2' directory. +See %3 for more information about YaST logs."), + "http://bugzilla.novell.com/", + "/var/log/YaST2/", + // link to the Yast Bug Reporting HOWTO + // for translators: use the localized page for your language if it exists, + // check the combo box "In other laguages" on top of the page + _("http://en.opensuse.org/Bugs/YaST") + ))) + ) + ), + `ButtonBox (`PushButton (`id(`ok), Label::OKButton())) + )); + + if (success != true) { + y2error ("Cannot open a dialog: %1/%2/%3", heading, error_text, details); + return; + } + + UI::UserInput(); + + UI::CloseDialog(); + } + +/* EOF */ +} -- 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] r55114 - /tags/stable-2_18_2/pkg-bindings/
by lslezak＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: lslezak Date: Wed Jan 28 14:29:01 2009 New Revision: 55114 URL: http://svn.opensuse.org/viewcvs/yast?rev=55114&view=rev Log: Created tag stable-2_18_2 for pkg-bindings Added: tags/stable-2_18_2/pkg-bindings/ - copied from r55113, 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] r55113 - /tags/branch-Code-11-2_17_35/pkg-bindings/
by lslezak＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: lslezak Date: Wed Jan 28 14:25:34 2009 New Revision: 55113 URL: http://svn.opensuse.org/viewcvs/yast?rev=55113&view=rev Log: Created tag branch-Code-11-2_17_35 for pkg-bindings Added: tags/branch-Code-11-2_17_35/pkg-bindings/ - copied from r55112, branches/SuSE-Code-11-Branch/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] r55112 - /tags/branch-Code-11-2_17_35/
by lslezak＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: lslezak Date: Wed Jan 28 14:25:32 2009 New Revision: 55112 URL: http://svn.opensuse.org/viewcvs/yast?rev=55112&view=rev Log: Created tag branch-Code-11-2_17_35 Added: tags/branch-Code-11-2_17_35/ -- 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] r55111 - in /branches/SuSE-Code-11-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Package.cc
by lslezak＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: lslezak Date: Wed Jan 28 14:23:34 2009 New Revision: 55111 URL: http://svn.opensuse.org/viewcvs/yast?rev=55111&view=rev Log: - Fixed Pkg::SetSolverFlags() function - properly set "ignoreAlreadyRecommended" flag, do not select extra packages for installation (bnc#470185) - 2.17.35 Modified: branches/SuSE-Code-11-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-Branch/pkg-bindings/src/Package.cc Modified: branches/SuSE-Code-11-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/VERSION Wed Jan 28 14:23:34 2009 @@ -1 +1 @@ -2.17.34 +2.17.35 Modified: branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Wed Jan 28 14:23:34 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jan 28 14:11:58 CET 2009 - lslezak(a)suse.cz + +- Fixed Pkg::SetSolverFlags() function - properly set + "ignoreAlreadyRecommended" flag, do not select extra packages for + installation (bnc#470185) +- 2.17.35 + +------------------------------------------------------------------- Mon Jan 26 16:26:46 CET 2009 - lslezak(a)suse.cz - implemented RemoveResolvableReport::problem() callback, do not Modified: branches/SuSE-Code-11-Branch/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/src/Package.cc (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/src/Package.cc Wed Jan 28 14:23:34 2009 @@ -1924,7 +1924,7 @@ const YCPString ignore_key("ignoreAlreadyRecommended"); if (!params.isNull() && !params->value(ignore_key).isNull() && params->value(ignore_key)->isBoolean()) { - bool ignoreAlreadyRecommended = zypp_ptr()->resolver()->ignoreAlreadyRecommended(); + bool ignoreAlreadyRecommended = params->value(ignore_key)->asBoolean()->value(); y2milestone("Setting solver flag ignoreAlreadyRecommended: %d", ignoreAlreadyRecommended); zypp_ptr()->resolver()->setIgnoreAlreadyRecommended(ignoreAlreadyRecommended); } -- 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] r55110 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Package.cc
by lslezak＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: lslezak Date: Wed Jan 28 14:20:49 2009 New Revision: 55110 URL: http://svn.opensuse.org/viewcvs/yast?rev=55110&view=rev Log: - Fixed Pkg::SetSolverFlags() function - properly set "ignoreAlreadyRecommended" flag, do not select extra packages for installation (bnc#470185) - 2.18.2 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Package.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=55110&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Wed Jan 28 14:20:49 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 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 Wed Jan 28 14:20:49 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jan 28 14:11:58 CET 2009 - lslezak(a)suse.cz + +- Fixed Pkg::SetSolverFlags() function - properly set + "ignoreAlreadyRecommended" flag, do not select extra packages for + installation (bnc#470185) +- 2.18.2 + +------------------------------------------------------------------- Mon Jan 26 16:26:46 CET 2009 - lslezak(a)suse.cz - implemented RemoveResolvableReport::problem() callback, do not Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Wed Jan 28 14:20:49 2009 @@ -1920,7 +1920,7 @@ const YCPString ignore_key("ignoreAlreadyRecommended"); if (!params.isNull() && !params->value(ignore_key).isNull() && params->value(ignore_key)->isBoolean()) { - bool ignoreAlreadyRecommended = zypp_ptr()->resolver()->ignoreAlreadyRecommended(); + bool ignoreAlreadyRecommended = params->value(ignore_key)->asBoolean()->value(); y2milestone("Setting solver flag ignoreAlreadyRecommended: %d", ignoreAlreadyRecommended); zypp_ptr()->resolver()->setIgnoreAlreadyRecommended(ignoreAlreadyRecommended); } -- 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] r55109 - in /trunk/storage: ./ libstorage/src/ package/ storage/src/include/ storage/src/modules/
by aschnell＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: aschnell Date: Wed Jan 28 14:20:37 2009 New Revision: 55109 URL: http://svn.opensuse.org/viewcvs/yast?rev=55109&view=rev Log: - merged SuSE-Code-11 branch to trunk Modified: trunk/storage/ (props changed) trunk/storage/VERSION trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/DmPart.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_lib.ycp trunk/storage/storage/src/include/do_proposal_flexible.ycp trunk/storage/storage/src/include/ep-all.ycp trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-loop.ycp trunk/storage/storage/src/include/ep-lvm.ycp trunk/storage/storage/src/include/ep-nfs.ycp trunk/storage/storage/src/include/ep-raid.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=55109&r1=551… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Wed Jan 28 14:20:37 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Wed Jan 28 14:20:37 2009 @@ -841,22 +841,16 @@ "of partitions that the kernel driver of the disk can handle is %3$lu.\n" "Partitions numbered above %3$lu cannot be accessed."), (char*)dev.c_str(), range_exceed, range-1 ); - if( dev.find( "/dev/sd" )==0 ) - { - txt += "\n"; - txt += - // popup text -_("openSUSE is switching to the new IDE drivers using the libata\n" -"modules. These do only support partitions with up to 15\n" -"partitions. You have the following options with openSUSE 10.3:\n" -" - Use the old IDE drivers: Boot again and add\n" -" \'hwprobe=-modules.pata\' as argument to the kernel\n" -" - Repartition your system so that maximal 15 partitions are used.\n" -" To repartition, use your existing operating system.\n" + txt += "\n"; + txt += + // popup text +_("You have the following options:\n" +" - Repartition your system so that only the maximal allowed number\n" +" of partitions is used. To repartition, use your existing operating\n" +" system.\n" " - Use LVM since it can provide an arbitrary and flexible\n" " number of block devices partitions. This needs a repartition\n" " as well."); - } getStorage()->addInfoPopupText( dev, txt ); } for( list<Partition*>::iterator i=pl.begin(); i!=pl.end(); ++i ) Modified: trunk/storage/libstorage/src/DmPart.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPart.cc… ============================================================================== --- trunk/storage/libstorage/src/DmPart.cc (original) +++ trunk/storage/libstorage/src/DmPart.cc Wed Jan 28 14:20:37 2009 @@ -102,7 +102,7 @@ static string udevCompleteIdPath( const string& s, unsigned nr ) { - return( "/dev/disk/by-id/" + s + "_part" + decString(nr) ); + return( "/dev/disk/by-id/" + s + "-part" + decString(nr) ); } 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 Wed Jan 28 14:20:37 2009 @@ -207,8 +207,11 @@ if( instsys() ) { DmraidCo::activate( true ); + waitForDevice(); MdCo::activate( true, tmpDir() ); + waitForDevice(); LvmVg::activate( true ); + waitForDevice(); delete ppart; ppart = new ProcPart; } 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 Wed Jan 28 14:20:37 2009 @@ -1,14 +1,31 @@ ------------------------------------------------------------------- Tue Jan 27 10:38:28 CET 2009 - aschnell(a)suse.de -- make "Installation Summary" directly accessible in expert +- make "Installation Summary" directly accessible in expert partitioner +- 2.18.2 + +------------------------------------------------------------------- + +Mon Jan 26 12:22:36 CET 2009 - aschnell(a)suse.de + +- fixed udev partition postfix for dm based devices (bnc #468786) + +------------------------------------------------------------------- +Mon Jan 19 11:32:44 CET 2009 - aschnell(a)suse.de + +- wait for udev after activating dmraid (bnc #459032) + +------------------------------------------------------------------- +Fri Jan 16 16:37:04 CET 2009 - kmachalkova(a)suse.cz + +- Equal length of passwd input fields (#465367) ------------------------------------------------------------------- Fri Jan 16 13:56:03 CET 2009 - kmachalkova(a)suse.cz - Display logical volume name in dialog captions in adding logical - volume workflow (bnc#432952) + volume workflow (bnc#432952) ------------------------------------------------------------------- Wed Jan 14 16:50:42 CET 2009 - aschnell(a)suse.de @@ -17,6 +34,11 @@ - 2.18.1 ------------------------------------------------------------------- +Thu Jan 08 12:28:35 CET 2009 - aschnell(a)suse.de + +- report error for invalid mount point (bnc #464354) + +------------------------------------------------------------------- Fri Dec 19 18:48:45 CET 2008 - aschnell(a)suse.de - redesigned resize dialog (bnc #456816 and #456816) @@ -36,6 +58,35 @@ - 2.18.0 ------------------------------------------------------------------- +Fri Dec 19 11:50:11 CET 2008 - aschnell(a)suse.de + +- don't check swap partitions on disks used by BIOS RAID or + DM Multipath (bnc #460081) + +------------------------------------------------------------------- +Thu Dec 18 11:13:48 CET 2008 - kmachalkova(a)suse.cz + +- Usability improvements (added F-key bindings, focusing convenient + widgets where appropriate, pointing out widgets with invalid data) +- Suggest max size for extended partitions, custom size/region for + the rest (bnc#428337) +- Enforce specifying mountpoint if the user wants to mount the + partition (bnc#441130) + +------------------------------------------------------------------- +Wed Dec 17 14:36:26 CET 2008 - aschnell(a)suse.de + +- fixed accepting expert partitioner status after "Import Mount + Points" (bnc #453746) + +------------------------------------------------------------------- +Tue Dec 16 10:40:10 CET 2008 - aschnell(a)suse.de + +- start yast2-multipath in running system if available (bnc + #459073) +- fixed popup message (bnc #458972) + +------------------------------------------------------------------- Thu Dec 11 16:37:11 CET 2008 - aschnell(a)suse.de - fixed reading of udev links for cciss devices (bnc #449110) @@ -44,7 +95,7 @@ ------------------------------------------------------------------- Thu Dec 11 16:19:03 CET 2008 - kmachalkova(a)suse.cz -- If the test mount of NFS share fails, ask the user whether to +- If the test mount of NFS share fails, ask the user whether to save it anyway to allow correcting possible errors (bnc#450060) - Handle NFS share renaming (changing name of NFS server) 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 Wed Jan 28 14:20:37 2009 @@ -382,7 +382,8 @@ if (mount == "") { - allowed = true; + Popup::Error(_("Mount point must not be empty.")); + allowed = false; } else if (used_fs == `swap && mount != "swap") { @@ -507,10 +508,9 @@ map ret = $[]; ret["ok"] = true; new["mount"] = UI::QueryWidget(`id(`mount_point), `Value); - new["mount"] = deletechars( new["mount"]:"", " \t" ); if( old["mount"]:"" != new["mount"]:"" ) new["inactive"] = true; - if( ret["ok"]:false && size(new["mount"]:"")>0 ) + if( ret["ok"]:false ) { boolean crypt_fs = false; if( !check_mount_point( Storage::GetTargetMap(), dev, new )) Modified: trunk/storage/storage/src/include/do_proposal_flexible.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/do_p… ============================================================================== --- trunk/storage/storage/src/include/do_proposal_flexible.ycp (original) +++ trunk/storage/storage/src/include/do_proposal_flexible.ycp Wed Jan 28 14:20:37 2009 @@ -81,25 +81,27 @@ map swapable = $[]; -define void flex_init_swapable( map<string,map> tg ) - ``{ +void flex_init_swapable( map<string,map> tg ) +{ swapable = $[]; list swaps = Storage::SwappingPartitions(); - foreach( string dev, map disk, tg, - ``{ - list<map> sw = filter( map p, disk["partitions"]:[], - ``(p["type"]:`unknown!=`extended && - !p["delete"]:false && - p["detected_fs"]:`unknown==`swap)); - sw = filter( map p, sw, ``(contains( swaps, p["device"]:"" )|| - Storage::CheckSwapable(p["device"]:""))); - foreach( map p, sw, - ``{ - swapable[p["device"]:""] = true; + foreach(string dev, map disk, tg, { + if (disk["used_by_type"]:`UB_NONE == `UB_NONE) + { + list<map> sw = filter(map p, disk["partitions"]:[], + ``(p["type"]:`unknown!=`extended && + !p["delete"]:false && + p["detected_fs"]:`unknown==`swap)); + sw = filter(map p, sw, ``(contains(swaps, p["device"]:"") || + Storage::CheckSwapable(p["device"]:""))); + foreach(map p, sw, { + swapable[p["device"]:""] = true; }); - }); - y2milestone( "flex_init_swapable %1", swapable ); - } + } + }); + y2milestone("flex_init_swapable %1", swapable); +} + define boolean check_swapable( string dev ) { Modified: trunk/storage/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-a… ============================================================================== --- trunk/storage/storage/src/include/ep-all.ycp (original) +++ trunk/storage/storage/src/include/ep-all.ycp Wed Jan 28 14:20:37 2009 @@ -70,7 +70,6 @@ { case `import: ImportMountPoints(); - Storage::CreateTargetBackup("expert-partitioner"); UpdateMainStatus(); UpdateNavigationTree(nil); 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 Wed Jan 28 14:20:37 2009 @@ -296,17 +296,21 @@ mount = (string) UI::QueryWidget(`id(`mount_point), `Value); // TODO: checks - + //crypt-file specific checks if (data["type"]:`unknown == `loop) { + //is encrypt fs checked? if (!crypt_fs) { // error popup Popup::Error(_("Crypt files must be encrypted.")); + UI::ChangeWidget(`id(`crypt_fs), `Value, true); + UI::SetFocus(`id(`crypt_fs)); widget = `again; continue; } + //enforce formatting the crypt-file if (data["create_file"]:false && !do_format) { // error popup @@ -315,14 +319,20 @@ Also check the format option. ")); + UI::ChangeWidget(`id(`do_format), `Value, true); + UI::ChangeWidget(`id(`do_format_attachment), `Enabled, true); + UI::SetFocus(`id(`fs)); widget = `again; continue; } - - if (!do_mount || mount == "") + //enforce specifying mountpoint + if (!do_mount) { // error popup Popup::Error(_("Crypt files require a mount point.")); + UI::ChangeWidget(`id(`do_mount), `Value, true); + UI::ChangeWidget(`id(`do_mount_attachment), `Enabled, true); + UI::SetFocus(`id(`mount_point)); widget = `again; continue; } @@ -455,11 +465,11 @@ term contents = `HVSquash(`FrameWithMarginBox(_("Password"), `VBox( - `Password(`id(`pw1), + `Password(`id(`pw1), `opt(`hstretch), // Label: get password for user root // Please use newline if label is longer than 40 characters _("&Enter a password for your file system:"), ""), - `Password(`id(`pw2), + `Password(`id(`pw2), `opt(`hstretch), // Label: get same password again for verification // Please use newline if label is longer than 40 characters _("Reenter the password for &verification:"), ""), @@ -477,11 +487,12 @@ symbol widget = nil; + //don't put those inside the loop - they'd be reset after each unsuccesful try + UI::ChangeWidget(`id(`pw1), `Value, ""); + UI::ChangeWidget(`id(`pw2), `Value, ""); + repeat { - UI::ChangeWidget(`id(`pw1), `Value, ""); - UI::ChangeWidget(`id(`pw2), `Value, ""); - widget = MiniWorkflow::UserInput(); if (widget == `next) @@ -493,6 +504,7 @@ { // popup text Popup::Message(_("The first and the second version\nof the password do not match!\nPlease try again.")); + UI::SetFocus(`id(`pw1) ); widget = `again; } else if (pw1 == "" && !empty_pw_allowed) @@ -501,6 +513,7 @@ Popup::Message(_("You did not enter a password. Try again. ")); + UI::SetFocus(`id(`pw1) ); widget = `again; } else if (size(pw1) < min_pw_len && !empty_pw_allowed) @@ -509,6 +522,7 @@ Popup::Message(sformat(_("The password must have at least %1 characters. Try again. "), min_pw_len)); + UI::SetFocus(`id(`pw1) ); widget = `again; } else if (size(pw1) >= min_pw_len || empty_pw_allowed) @@ -520,6 +534,7 @@ Popup::Message(_("The password may only contain the following characters: 0..9, a..z, A..Z, and any of \"@#* ,.;:._-+!$%&/|\?{[()]}^\\<>\". Try again.")); + UI::SetFocus(`id(`pw1) ); widget = `again; } } Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Wed Jan 28 14:20:37 2009 @@ -105,7 +105,19 @@ integer min_size_k = tointeger(float::ceil(cyl_size / 1024.0)); integer max_size_k = (slot[1]:0 * cyl_size) / 1024; - symbol what = (region == slot) ? `max_size : `manual_region; + symbol type = data["type"]:`unknown; + symbol what = `nothing; // ;-) + + //prefer max size for extended partition (#428337) + //cascaded triple operators would do, but this is more readable + if (region == slot) + { + what = (type == `extended) ? `max_size: `manual_size; + } + else + { + what = `manual_region; + } term contents = `HVSquash( // frame heading @@ -134,9 +146,10 @@ )); MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepPartitionSizeHelptext()); - MiniWorkflow::SetLastStep(data["type"]:`unknown == `extended); + MiniWorkflow::SetLastStep( type == `extended); UI::ChangeWidget(`id(`size), `Value, what); + UI::SetFocus(`id(what)); UI::ChangeWidget(`id(`manual_size_attachment), `Enabled, what == `manual_size); UI::ChangeWidget(`id(`size_input), `Value, Storage::KByteToHumanString(size_k)); UI::ChangeWidget(`id(`manual_region_attachment), `Enabled, what == `manual_region); @@ -157,11 +170,13 @@ case `manual_size: UI::ChangeWidget(`id(`manual_size_attachment), `Enabled, true); UI::ChangeWidget(`id(`manual_region_attachment), `Enabled, false); + UI::SetFocus(`id(`size_input)); break; case `manual_region: UI::ChangeWidget(`id(`manual_size_attachment), `Enabled, false); UI::ChangeWidget(`id(`manual_region_attachment), `Enabled, true); + UI::SetFocus(`id(`end_cyl)); // or `start_cyl, who cares break; case `next: @@ -178,6 +193,7 @@ Popup::Error(sformat(_("The size entered is invalid. Enter a value like \"%1\" or \"%2\"."), Storage::KByteToHumanString(500*1024), Storage::KByteToHumanString(1024*1024))); + UI::SetFocus(`id(`size_input)); widget = `again; continue; } @@ -187,6 +203,7 @@ Popup::Error(sformat(_("The size entered is invalid. Enter a size between %1 and %2."), Storage::KByteToHumanString(min_size_k), Storage::KByteToHumanString(max_size_k))); + UI::SetFocus(`id(`size_input)); widget = `again; continue; } @@ -207,6 +224,7 @@ { // error popup Popup::Error(_("The region entered is invalid.")); + UI::SetFocus(`id(`end_cyl)); widget = `again; continue; } Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Wed Jan 28 14:20:37 2009 @@ -154,7 +154,8 @@ break; case `multipath: - if (ProductFeatures::GetBooleanFeature("partitioning", "use_separate_multipath_module") == true) + if ((ProductFeatures::GetBooleanFeature("partitioning", "use_separate_multipath_module") == true) || + (Mode::normal() && WFM::ClientExists("multipath"))) // popup text CallConfig(_("Calling Multipath configuration cancels all current changes. Really call Multipath configuration?"), ["yast2-multipath"], "multipath"); @@ -354,6 +355,7 @@ EpDasdfmtDisk(disk_device); break; } + UI::SetFocus(`id(`table)); } @@ -490,5 +492,6 @@ EpDeletePartition(part_device); break; } + UI::SetFocus(`id(`text)); } } Modified: trunk/storage/storage/src/include/ep-loop.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-loop.ycp (original) +++ trunk/storage/storage/src/include/ep-loop.ycp Wed Jan 28 14:20:37 2009 @@ -59,6 +59,7 @@ EpCreateLoop(); break; } + UI::SetFocus(`id(`table)); } @@ -110,5 +111,6 @@ EpDeleteLoop(part_device); break; } + UI::SetFocus(`id(`text)); } } Modified: trunk/storage/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm.ycp Wed Jan 28 14:20:37 2009 @@ -60,6 +60,7 @@ EpCreateVolumeGroup(); break; } + UI::SetFocus(`id(`table)); } @@ -108,6 +109,7 @@ EpDeleteVolumeGroup(device); break; } + UI::SetFocus(`id(`text)); } @@ -178,6 +180,7 @@ EpDeleteLogicalVolume(lv_device); break; } + UI::SetFocus(`id(`table)); } Modified: trunk/storage/storage/src/include/ep-nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-n… ============================================================================== --- trunk/storage/storage/src/include/ep-nfs.ycp (original) +++ trunk/storage/storage/src/include/ep-nfs.ycp Wed Jan 28 14:20:37 2009 @@ -197,6 +197,7 @@ default: break; } + UI::SetFocus(`id(`fstable)); UpdateMainStatus(); } //FIXME: Take care that non-fstab settings of nfs-client Modified: trunk/storage/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid.ycp (original) +++ trunk/storage/storage/src/include/ep-raid.ycp Wed Jan 28 14:20:37 2009 @@ -60,6 +60,7 @@ EpCreateRaid(); break; } + UI::SetFocus(`id(`table)); } @@ -117,6 +118,7 @@ EpDeleteRaid(device); break; } + UI::SetFocus(`id(`text)); } Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Jan 28 14:20:37 2009 @@ -3314,7 +3314,6 @@ global define boolean CheckSwapable( string dev ) { string cmd = "swapon " + dev; - RemoveDmMapsTo( dev ); boolean ok = (integer)SCR::Execute(.target.bash, cmd )==0; if( ok ) { -- 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] r55108 - in /trunk/qt-graph/src: QY2Graph.cc QY2Graph.h
by aschnell＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: aschnell Date: Wed Jan 28 12:17:12 2009 New Revision: 55108 URL: http://svn.opensuse.org/viewcvs/yast?rev=55108&view=rev Log: - cleanup Modified: trunk/qt-graph/src/QY2Graph.cc trunk/qt-graph/src/QY2Graph.h Modified: trunk/qt-graph/src/QY2Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/src/QY2Graph.cc?rev=551… ============================================================================== --- trunk/qt-graph/src/QY2Graph.cc (original) +++ trunk/qt-graph/src/QY2Graph.cc Wed Jan 28 12:17:12 2009 @@ -105,18 +105,18 @@ QPointF -QY2Graph::gToQ(const point& p, bool trans) const +QY2Graph::gToQ(const point& p, bool upside_down) const { QPointF tmp(p.x, p.y); - return trans ? QPointF(tmp.x(), size.height() - tmp.y()) : QPointF(tmp.x(), -tmp.y()); + return upside_down ? QPointF(tmp.x(), size.height() - tmp.y()) : QPointF(tmp.x(), -tmp.y()); } QPointF -QY2Graph::gToQ(const pointf& p, bool trans) const +QY2Graph::gToQ(const pointf& p, bool upside_down) const { QPointF tmp(p.x, p.y); - return trans ? QPointF(tmp.x(), size.height() - tmp.y()) : QPointF(tmp.x(), -tmp.y()); + return upside_down ? QPointF(tmp.x(), size.height() - tmp.y()) : QPointF(tmp.x(), -tmp.y()); } @@ -155,7 +155,7 @@ QPainterPath -QY2Graph::haha3(const bezier& bezier) const +QY2Graph::makeBezier(const bezier& bezier) const { QPainterPath path; path.moveTo(gToQ(bezier.list[0])); @@ -234,7 +234,7 @@ QPolygonF -QY2Graph::haha1(node_t* node) const +QY2Graph::makeShapeHelper(node_t* node) const { const polygon_t* poly = (polygon_t*) ND_shape_info(node); @@ -254,7 +254,7 @@ QPainterPath -QY2Graph::haha2(node_t* node) const +QY2Graph::makeShape(node_t* node) const { QPainterPath path; @@ -266,14 +266,14 @@ (strcmp(name, "polygon") == 0) || (strcmp(name, "diamond") == 0)) { - QPolygonF polygon = haha1(node); + QPolygonF polygon = makeShapeHelper(node); polygon.append(polygon[0]); path.addPolygon(polygon); } else if ((strcmp(name, "ellipse") == 0) || (strcmp(name, "circle") == 0)) { - QPolygonF polygon = haha1(node); + QPolygonF polygon = makeShapeHelper(node); path.addEllipse(QRectF(polygon[0], polygon[1])); } else @@ -337,7 +337,7 @@ drawLabel(ND_label(node), &painter); painter.end(); - QY2Node* item = new QY2Node(haha2(node), picture); + QY2Node* item = new QY2Node(makeShape(node), picture); item->setPos(gToQ(ND_coord_i(node))); @@ -364,7 +364,7 @@ QColor color(aggetToQColor(edge, "color", Qt::black)); - QPainterPath path(haha3(bz)); + QPainterPath path(makeBezier(bz)); QPicture picture; QPainter painter; Modified: trunk/qt-graph/src/QY2Graph.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/src/QY2Graph.h?rev=5510… ============================================================================== --- trunk/qt-graph/src/QY2Graph.h (original) +++ trunk/qt-graph/src/QY2Graph.h Wed Jan 28 12:17:12 2009 @@ -66,32 +66,22 @@ QSizeF size; - /** - * Transform graphviz point into Qt QPointF. - */ - QPointF gToQ(const point& p, bool trans = true) const; - - /** - * Transform graphviz pointf into Qt QPointF. - */ - QPointF gToQ(const pointf& p, bool trans = true) const; + QPointF gToQ(const point& p, bool upside_down = true) const; + QPointF gToQ(const pointf& p, bool upside_down = true) const; QString aggetToQString(void* obj, const char* name, const QString& fallback) const; - QColor aggetToQColor(void* obj, const char* name, const QColor& fallback) const; - Qt::PenStyle aggetToQPenStyle(void* obj, const char* name, const Qt::PenStyle fallback) const; - void drawArrow(const QLineF& line, const QColor& color, QPainter* painter) const; - - QPolygonF haha1(node_t* node) const; + QPainterPath makeShape(node_t* node) const; + QPolygonF makeShapeHelper(node_t* node) const; - QPainterPath haha2(node_t* node) const; - - QPainterPath haha3(const bezier& bezier) const; + QPainterPath makeBezier(const bezier& bezier) const; void drawLabel(const textlabel_t* textlabel, QPainter* painter) const; + void drawArrow(const QLineF& line, const QColor& color, QPainter* painter) const; + }; -- 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] r55107 - in /trunk/yast2: library/packages/src/PackagesUI.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: lslezak Date: Wed Jan 28 11:56:44 2009 New Revision: 55107 URL: http://svn.opensuse.org/viewcvs/yast?rev=55107&view=rev Log: - PackagesUI - removed textdomain switches Modified: trunk/yast2/library/packages/src/PackagesUI.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/PackagesUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackagesUI.ycp (original) +++ trunk/yast2/library/packages/src/PackagesUI.ycp Wed Jan 28 11:56:44 2009 @@ -152,9 +152,6 @@ { ui = nil; - // TODO FIXME: due to the textfreeze "base" cannot be used now, fix it after the GM is out! - textdomain "packager"; - // help text string help = _("<big>License Confirmation</big> The package in the headline of the dialog requires an explicit confirmation @@ -164,9 +161,6 @@ To accept the license of the package, click I Agree. To reject the license of the package, click I Disagree."); - // TODO FIXME: remove this - textdomain "base"; - UI::OpenDialog (`HBox ( `VSpacing (18), `VBox ( @@ -309,9 +303,6 @@ return RunPackageSelector($[]); // Fallback: detailed selection } - // TODO FIXME: due to the textfreeze "base" cannot be used now, fix it after the GM is out! - textdomain "packager"; - // Help text for software patterns / selections dialog string help_text = _(" @@ -353,9 +344,6 @@ false, // has_back true ); // has_next - // TODO FIXME: remove this - textdomain "base"; - Wizard::SetDesktopIcon( "sw_single" ); symbol result = nil; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Jan 28 11:56:44 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 28 11:55:29 CET 2009 - lslezak(a)suse.cz + +- PackagesUI - removed textdomain switches + +------------------------------------------------------------------- Tue Jan 27 17:36:15 CET 2009 - locilka(a)suse.cz - Added ag_freespace - SCR agent for checking free space in -- 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] r55106 - /trunk/qt-graph/src/QY2Graph.cc
by aschnell＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: aschnell Date: Wed Jan 28 11:48:48 2009 New Revision: 55106 URL: http://svn.opensuse.org/viewcvs/yast?rev=55106&view=rev Log: - added some shapes Modified: trunk/qt-graph/src/QY2Graph.cc Modified: trunk/qt-graph/src/QY2Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/src/QY2Graph.cc?rev=551… ============================================================================== --- trunk/qt-graph/src/QY2Graph.cc (original) +++ trunk/qt-graph/src/QY2Graph.cc Wed Jan 28 11:48:48 2009 @@ -261,6 +261,9 @@ const char* name = ND_shape(node)->name; if ((strcmp(name, "rectangle") == 0) || + (strcmp(name, "box") == 0) || + (strcmp(name, "hexagon") == 0) || + (strcmp(name, "polygon") == 0) || (strcmp(name, "diamond") == 0)) { QPolygonF polygon = haha1(node); @@ -323,7 +326,6 @@ // don't use gToQ here since it adjusts the values QRectF rect(GD_bb(graph).LL.x, GD_bb(graph).LL.y, GD_bb(graph).UR.x, GD_bb(graph).UR.y); scene->setSceneRect(rect.adjusted(-5, -5, +5, +5)); - size = rect.size(); for (node_t* node = agfstnode(graph); node != NULL; node = agnxtnode(graph, node)) @@ -409,7 +411,7 @@ void -QY2Node::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) +QY2Node::mouseDoubleClickEvent(QGraphicsSceneMouseEvent*) { emit doubleClickEvent(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0