January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60224 - in /branches/SuSE-Code-11-SP1-Branch/packager: VERSION package/yast2-packager.changes
by locilka＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: locilka Date: Mon Jan 4 16:30:48 2010 New Revision: 60224 URL: http://svn.opensuse.org/viewcvs/yast?rev=60224&view=rev Log: New version Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Mon Jan 4 16:30:48 2010 @@ -1 +1 @@ -2.17.63 +2.17.64 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Mon Jan 4 16:30:48 2010 @@ -2,6 +2,7 @@ Mon Jan 4 16:18:08 CET 2010 - locilka(a)suse.cz - Fixed accepting/declining the multilicense agreement. +- 2.17.64 ------------------------------------------------------------------- Fri Dec 11 16:48:58 CET 2009 - locilka(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] r60223 - in /branches/SuSE-Code-11-SP1-Branch/installation: VERSION package/yast2-installation.changes
by locilka＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: locilka Date: Mon Jan 4 16:30:36 2010 New Revision: 60223 URL: http://svn.opensuse.org/viewcvs/yast?rev=60223&view=rev Log: New version Modified: branches/SuSE-Code-11-SP1-Branch/installation/VERSION branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Modified: branches/SuSE-Code-11-SP1-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/VERSION Mon Jan 4 16:30:36 2010 @@ -1 +1 @@ -2.17.61 +2.17.62 Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Mon Jan 4 16:30:36 2010 @@ -2,6 +2,7 @@ Fri Dec 11 16:48:58 CET 2009 - locilka(a)suse.cz - Adapted for new API to ProductLicense (FATE #306295). +- 2.17.62 ------------------------------------------------------------------- Wed Dec 9 16:44:34 CET 2009 - locilka(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] r60222 - in /trunk/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: locilka Date: Mon Jan 4 16:19:12 2010 New Revision: 60222 URL: http://svn.opensuse.org/viewcvs/yast?rev=60222&view=rev Log: Fixed accepting/declining the multilicense agreement. Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Jan 4 16:19:12 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 4 16:18:08 CET 2010 - locilka(a)suse.cz + +- Fixed accepting/declining the multilicense agreement. + +------------------------------------------------------------------- Fri Dec 11 16:48:58 CET 2009 - locilka(a)suse.cz - ProductLicense prepared for multi-license dialogs (FATE #306295). Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLice… ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Mon Jan 4 16:19:12 2010 @@ -790,8 +790,10 @@ string eula_id = nil; foreach (string one_license_id, license_ids, { - if (AcceptanceNeeded (one_license_id)) + if (AcceptanceNeeded (one_license_id) != true) { + y2milestone ("License %1 does not need to be accepted", one_license_id); return; + } eula_id = sformat ("eula_%1", one_license_id); if ((boolean) UI::WidgetExists (`id (eula_id)) != true) { @@ -800,7 +802,10 @@ } // All licenses have to be accepted - if (regexpmatch ((string) UI::QueryWidget(`id (eula_id), `CurrentButton), "^yes_")) { + string license_accepted = (string) UI::QueryWidget (`id (eula_id), `CurrentButton); + y2milestone ("License %1 accepted: %2", eula_id, license_accepted); + + if (! regexpmatch (license_accepted, "^yes_")) { accepted = false; break; } @@ -1124,9 +1129,9 @@ y2milestone("AutoYaST: License has been accepted automatically"); ret = `accepted; } else { - foreach (map <string, string> tmp_licenses, licenses, { - symbol tmp_ret = HandleLicenseDialogRet (tmp_licenses, base_product, action); - }); + map <string, string> tmp_licenses = $[]; + ret = HandleLicenseDialogRet (tmp_licenses, base_product, action); + y2milestone ("Dialog ret: %1", ret); } // store already accepted license IDs -- 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] r60221 - in /branches/SuSE-Code-11-SP1-Branch/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: locilka Date: Mon Jan 4 16:18:56 2010 New Revision: 60221 URL: http://svn.opensuse.org/viewcvs/yast?rev=60221&view=rev Log: Fixed accepting/declining the multilicense agreement. Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Mon Jan 4 16:18:56 2010 @@ -1,3 +1,8 @@ +------------------------------------------------------------------ +Mon Jan 4 16:18:08 CET 2010 - locilka(a)suse.cz + +- Fixed accepting/declining the multilicense agreement. + ------------------------------------------------------------------- Fri Dec 11 16:48:58 CET 2009 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/ProductLicense.ycp Mon Jan 4 16:18:56 2010 @@ -790,8 +790,10 @@ string eula_id = nil; foreach (string one_license_id, license_ids, { - if (AcceptanceNeeded (one_license_id)) + if (AcceptanceNeeded (one_license_id) != true) { + y2milestone ("License %1 does not need to be accepted", one_license_id); return; + } eula_id = sformat ("eula_%1", one_license_id); if ((boolean) UI::WidgetExists (`id (eula_id)) != true) { @@ -800,7 +802,10 @@ } // All licenses have to be accepted - if (regexpmatch ((string) UI::QueryWidget(`id (eula_id), `CurrentButton), "^yes_")) { + string license_accepted = (string) UI::QueryWidget (`id (eula_id), `CurrentButton); + y2milestone ("License %1 accepted: %2", eula_id, license_accepted); + + if (! regexpmatch (license_accepted, "^yes_")) { accepted = false; break; } @@ -1124,9 +1129,9 @@ y2milestone("AutoYaST: License has been accepted automatically"); ret = `accepted; } else { - foreach (map <string, string> tmp_licenses, licenses, { - symbol tmp_ret = HandleLicenseDialogRet (tmp_licenses, base_product, action); - }); + map <string, string> tmp_licenses = $[]; + ret = HandleLicenseDialogRet (tmp_licenses, base_product, action); + y2milestone ("Dialog ret: %1", ret); } // store already accepted license IDs -- 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] r60220 - /trunk/storage/storage/src/include/ep-hd.ycp
by aschnell＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: aschnell Date: Mon Jan 4 15:51:00 2010 New Revision: 60220 URL: http://svn.opensuse.org/viewcvs/yast?rev=60220&view=rev Log: - use SplitDevice function Modified: trunk/storage/storage/src/include/ep-hd.ycp 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 Mon Jan 4 15:51:00 2010 @@ -53,6 +53,7 @@ } } + term HdButtonBox() { return `HBox( @@ -65,37 +66,48 @@ ); } + void HandleHdButtons( any user_data, string device, map event ) { - string disk = ""; + string disk_device = ""; boolean is_disk = false; if (user_data == nil) { - map dev = Storage::GetDiskPartition( device ); - disk = (string) dev["disk"]:nil; - // FIXME: is this necessary & sufficient condition? - is_disk = dev["nr"]:nil == ""; + map disk = nil; + map part = nil; + + map<string, map> target_map = Storage::GetTargetMap(); + SplitDevice(target_map, device, disk, part); + disk_device = (string) disk["device"]:""; + is_disk = part == nil; } else { - disk = (string) user_data; + disk_device = (string) user_data; } switch (Event::IsWidgetActivated(event)) { case `add: - EpCreatePartition( disk ); + if (is_disk) + EpCreatePartition(disk_device); + else + // error popup + Popup::Error(_("Select a hard disks, BIOS RAIDs or multipath +devices to add a partition.")); break; + case `edit: - if ( is_disk ) - TreePanel::SwitchToNew( disk ); + if (is_disk) + TreePanel::SwitchToNew( disk_device ); else EpEditPartition( device ); break; case `resize: - if ( is_disk ) + if (is_disk) + // error popup Popup::Error(_("Hard disks, BIOS RAIDs and multipath devices cannot be resized.")); else @@ -103,14 +115,15 @@ break; case `delete: - if ( is_disk ) - EpDeleteDisk( device ); + if (is_disk) + EpDeleteDisk(disk_device); else EpDeletePartition ( device, UI::WidgetExists(`id(`table)) ? `table : `overview ); break; } } + void CreateHdMainPanel(any user_data) { symbol Predicate(map disk, map partition) -- 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] r60219 - /trunk/storage/storage/src/include/custom_part_dialogs.ycp
by aschnell＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: aschnell Date: Mon Jan 4 14:37:32 2010 New Revision: 60219 URL: http://svn.opensuse.org/viewcvs/yast?rev=60219&view=rev Log: - use ButtonBox widget (bnc #565871) Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Mon Jan 4 14:37:32 2010 @@ -271,8 +271,7 @@ `HSpacing(4) ), `VSpacing(2), - `HBox( - // Ok button + `ButtonBox( `PushButton(`id("ok"), `opt(`default), Label::OKButton()), // Cancel button `PushButton(`id("cancel"), _("&Skip") ) -- 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] r60218 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp
by aschnell＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: aschnell Date: Mon Jan 4 14:31:24 2010 New Revision: 60218 URL: http://svn.opensuse.org/viewcvs/yast?rev=60218&view=rev Log: - use ButtonBox widget (bnc #565871) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp 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 Mon Jan 4 14:31:24 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 04 14:29:41 CET 2010 - aschnell(a)suse.de + +- use ButtonBox widget (bnc #565871) + +------------------------------------------------------------------- Tue Dec 29 18:53:27 CET 2009 - aschnell(a)suse.de - ported MdPart code from SLE11 SP1 Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Mon Jan 4 14:31:24 2010 @@ -101,8 +101,8 @@ ), `VSpacing(3), `ButtonBox( - `PushButton(`id("ok"), `opt(`default), Label::OKButton()), - `PushButton(`id("cancel"), Label::CancelButton()) + `PushButton(`id("ok"), `opt(`default), Label::OKButton()), + `PushButton(`id("cancel"), Label::CancelButton()) ), `VSpacing(0.5) ) @@ -416,10 +416,10 @@ `HSpacing(1)), `VSpacing(1), `VStretch(), - `HBox( - `Left(`PushButton(`id(`help),`opt(`helpButton), Label::HelpButton())), - `Right(`HBox(`PushButton(`id(`ok), `opt(`default), Label::OKButton()), - `PushButton(`id(`cancel), Label::CancelButton()))) + `ButtonBox( + `PushButton(`id(`help), `opt(`helpButton), Label::HelpButton()), + `PushButton(`id(`ok), `opt(`default), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()) ) ) ); @@ -669,11 +669,10 @@ `HSpacing(1)), `VSpacing(1), `VStretch(), - `HBox( - `Left(`PushButton(`id(`help),`opt(`helpButton), Label::HelpButton())), - `Right(`HBox(`PushButton(`id(`ok), `opt(`default), Label::OKButton()), - `PushButton(`id(`cancel), Label::CancelButton())) - ) + `ButtonBox( + `PushButton(`id(`help), `opt(`helpButton), Label::HelpButton()), + `PushButton(`id(`ok), `opt(`default), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()) ) ) ); -- 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] r60217 - /trunk/storage/storage/src/include/raid_lib.ycp
by aschnell＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: aschnell Date: Mon Jan 4 12:39:28 2010 New Revision: 60217 URL: http://svn.opensuse.org/viewcvs/yast?rev=60217&view=rev Log: - disallow RAIDs on partitioned RAIDs Modified: trunk/storage/storage/src/include/raid_lib.ycp Modified: trunk/storage/storage/src/include/raid_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/raid… ============================================================================== --- trunk/storage/storage/src/include/raid_lib.ycp (original) +++ trunk/storage/storage/src/include/raid_lib.ycp Mon Jan 4 12:39:28 2010 @@ -52,14 +52,17 @@ // no RAID devices (this is for experts only, by hand) list<map> allret = []; + + list<symbol> allowed_ctypes = [ `CT_DISK, `CT_DMRAID, `CT_DMMULTIPATH ]; list types_no = [ `lvm, `sw_raid ]; list fsids = [ Partitions::fsid_lvm, Partitions::fsid_raid, Partitions::fsid_native ]; list ubs = [ `UB_NONE, `UB_MD ]; list allowed_enc_types = [ `none ]; - foreach( string dev, map devmap, targetMap, - ``{ + foreach (string dev, map devmap, targetMap, { + if (contains(allowed_ctypes, devmap["type"]:`CT_UNKNOWN)) + { ret = filter( map p, devmap["partitions"]:[], ``( size(p["mount"]:"")==0 && !contains( types_no, p["type"]:`primary ) && @@ -67,6 +70,7 @@ contains( ubs, p["used_by_type"]:`UB_NONE ) && (!haskey(p,"fsid")||contains( fsids, p["fsid"]:0 )))); allret = (list<map>)merge(allret, ret ); + } }); return( allret ); }; -- 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] r60216 - /branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/raid_lib.ycp
by aschnell＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: aschnell Date: Mon Jan 4 12:39:18 2010 New Revision: 60216 URL: http://svn.opensuse.org/viewcvs/yast?rev=60216&view=rev Log: - disallow RAIDs on partitioned RAIDs Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/raid_lib.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/raid_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/raid_lib.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/raid_lib.ycp Mon Jan 4 12:39:18 2010 @@ -53,14 +53,17 @@ // no RAID devices (this is for experts only, by hand) list<map> allret = []; + + list<symbol> allowed_ctypes = [ `CT_DISK, `CT_DMRAID, `CT_DMMULTIPATH ]; list types_no = [ `lvm, `sw_raid, `evms ]; list fsids = [ Partitions::fsid_lvm, Partitions::fsid_raid, Partitions::fsid_native ]; list ubs = [ `UB_NONE, `UB_MD ]; list allowed_enc_types = [ `none ]; - foreach( string dev, map devmap, targetMap, - ``{ + foreach (string dev, map devmap, targetMap, { + if (contains(allowed_ctypes, devmap["type"]:`CT_UNKNOWN)) + { ret = filter( map p, devmap["partitions"]:[], ``( size(p["mount"]:"")==0 && !contains( types_no, p["type"]:`primary ) && @@ -68,6 +71,7 @@ contains( ubs, p["used_by_type"]:`UB_NONE ) && (!haskey(p,"fsid")||contains( fsids, p["fsid"]:0 )))); allret = (list<map>)merge(allret, ret ); + } }); return( allret ); }; -- 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] r60215 - /branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageTypes.h
by aschnell＠svn.opensuse.org 04 Jan '10

04 Jan '10

Author: aschnell Date: Mon Jan 4 12:33:02 2010 New Revision: 60215 URL: http://svn.opensuse.org/viewcvs/yast?rev=60215&view=rev Log: - handle MDPART in container sorting function Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageTypes.h Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageTypes.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageTypes.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageTypes.h Mon Jan 4 12:33:02 2010 @@ -37,13 +37,14 @@ static const int order[COTYPE_LAST_ENTRY] = { 0, // CUNKNOWN 1, // DISK - 4, // MD - 7, // LOOP - 6, // LVM - 5, // DM + 5, // MD + 8, // LOOP + 7, // LVM + 6, // DM 2, // DMRAID - 8, // NFSC - 3 // DMMULTIPATH + 9, // NFSC + 3, // DMMULTIPATH + 4 // MDPART }; bool ret = order[a] < order[b]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0