May 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63921 - /branches/SuSE-Code-11-SP2-Branch/yast2/library/wizard/src/Wizard.ycp
by aschnell＠svn2.opensuse.org 06 May '11

06 May '11

Author: aschnell Date: Fri May 6 12:19:41 2011 New Revision: 63921 URL: http://svn.opensuse.org/viewcvs/yast?rev=63921&view=rev Log: - backported some functions need by storage Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/wizard/src/Wizard.ycp Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/wizard/src/Wizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/wizard/src/Wizard.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/wizard/src/Wizard.ycp Fri May 6 12:19:41 2011 @@ -624,7 +624,23 @@ * * Analog to Wizard::UserInput. **/ - global map WaitForEvent( integer timeout_millisec ) + global map WaitForEvent() + { + map input = UI::WaitForEvent(); + + if (input["ID"]:nil == `accept) input["ID"] = `next; + if (input["ID"]:nil == `cancel) input["ID"] = `back; + + return input; + } + + + /** + * Substitute for UI::WaitForEvent with timeout + * + * Analog to Wizard::UserInput. + **/ + global map TimeoutWaitForEvent( integer timeout_millisec ) { map input = UI::WaitForEvent( timeout_millisec ); -- 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] r63920 - in /branches/SuSE-Code-11-SP2-Branch/yast2: ./ library/control/src/ library/modules/ library/types/src/ package/
by aschnell＠svn2.opensuse.org 06 May '11

06 May '11

Author: aschnell Date: Fri May 6 12:02:04 2011 New Revision: 63920 URL: http://svn.opensuse.org/viewcvs/yast?rev=63920&view=rev Log: - backported some modules and functions need by storage Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/ContextMenu.ycp branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Event.ycp Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductFeatures.ycp branches/SuSE-Code-11-SP2-Branch/yast2/library/types/src/String.ycp branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/VERSION Fri May 6 12:02:04 2011 @@ -1 +1 @@ -2.17.92 +2.17.93 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductFeatures.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductFeatures.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductFeatures.ycp Fri May 6 12:02:04 2011 @@ -218,6 +218,25 @@ } /** + * Get value of a feature + * @stable + * @param section string section of the feature + * @param features string feature name + * @return integer the feature value + */ +global integer GetIntegerFeature (string section, string feature) { + any value = GetFeature (section, feature); + if (value == nil) + return nil; + else if (is (value, integer)) + return (integer) value; + else if (is (value, string)) + return tointeger((string) value); + else + return nil; +} + +/** * Set value of a feature * @stable * @param section string section of the feature Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/ContextMenu.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/ContextMenu.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/ContextMenu.ycp Fri May 6 12:02:04 2011 @@ -0,0 +1,17 @@ +/** + * File: ContextMenu.ycp + * Package: yast2 + * Summary: UI ContextMenu Helper + * Authors: Arvin Schnell <aschnell(a)suse.de> + */ +{ + module "ContextMenu"; + + + global symbol Simple(list<term> items) + { + UI::OpenContextMenu(`menu(items)); + + return (symbol) UI::UserInput(); + } +} Added: branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Event.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Event.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Event.ycp Fri May 6 12:02:04 2011 @@ -0,0 +1,151 @@ +/** + * File: Event.ycp + * Package: yast2 + * Summary: UI Event Helpers + * Authors: Arvin Schnell <aschnell(a)suse.de> + */ +{ + module "Event"; + + + /** + * Returns id of widget causing the event. + */ + global symbol GetWidgetId(map event) + { + return event["ID"]:(symbol)(nil); + } + + + /** + * Checks that the EventType is WidgetEvent and the EventReason is + * Activated. + * + * Returns id or nil. + */ + global symbol IsWidgetActivated(map event) + { + if (event["EventType"]:"Unknown" != "WidgetEvent") + return nil; + + if (event["EventReason"]:"Unknown" != "Activated") + return nil; + + return event["ID"]:(symbol)(nil); + } + + + /** + * Checks that the EventType is WidgetEvent and the EventReason is + * SelectionChanged. + * + * Returns id or nil. + */ + global symbol IsWidgetSelectionChanged(map event) + { + if (event["EventType"]:"Unknown" != "WidgetEvent") + return nil; + + if (event["EventReason"]:"Unknown" != "SelectionChanged") + return nil; + + return event["ID"]:(symbol)(nil); + } + + + /** + * Checks that the EventType is WidgetEvent and the EventReason is + * ValueChanged. + * + * Returns id or nil. + */ + global symbol IsWidgetValueChanged(map event) + { + if (event["EventType"]:"Unknown" != "WidgetEvent") + return nil; + + if (event["EventReason"]:"Unknown" != "ValueChanged") + return nil; + + return event["ID"]:(symbol)(nil); + } + + + /** + * Checks that the EventType is WidgetEvent and the EventReason is + * Activated or SelectionChanged. + * + * Returns id or nil. + */ + global symbol IsWidgetActivatedOrSelectionChanged(map event) + { + if (event["EventType"]:"Unknown" != "WidgetEvent") + return nil; + + if ((event["EventReason"]:"Unknown" != "Activated") && + (event["EventReason"]:"Unknown" != "SelectionChanged")) + return nil; + + return event["ID"]:(symbol)(nil); + } + + + /** + * Checks that the EventType is WidgetEvent and the EventReason is + * ContextMenuActivated. + * + * Returns id or nil. + */ + global symbol IsWidgetContextMenuActivated(map event) + { + if (event["EventType"]:"Unknown" != "WidgetEvent") + return nil; + + if (event["EventReason"]:"Unknown" != "ContextMenuActivated") + return nil; + + return event["ID"]:(symbol)(nil); + } + + + /** + * Checks that the EventType is MenuEvent. + * + * return id or nil. + */ + global symbol IsMenu(map event) + { + if (event["EventType"]:"Unknown" != "MenuEvent") + return nil; + + return event["ID"]:(symbol)(nil); + } + + + /** + * Checks that the EventType is TimeoutEvent. + * + * return id or nil. + */ + global symbol IsTimeout(map event) + { + if (event["EventType"]:"Unknown" != "TimeoutEvent") + return nil; + + return event["ID"]:(symbol)(nil); + } + + + /** + * Checks that the EventType is CancelEvent. + * + * return id or nil. + */ + global symbol IsCancel(map event) + { + if (event["EventType"]:"Unknown" != "CancelEvent") + return nil; + + return event["ID"]:(symbol)(nil); + } +} Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/types/src/String.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/types/src/String.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/types/src/String.ycp Fri May 6 12:02:04 2011 @@ -1242,5 +1242,13 @@ return ret; } +/** + * Checks whether string str starts with test. + */ +global boolean StartsWith(string str, string test) +{ + return search(str, test) == 0; +} + /* EOF */ } Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Fri May 6 12:02:04 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 06 11:47:03 CEST 2011 - aschnell(a)suse.de + +- backported some modules and functions need by storage +- 2.17.93 + +------------------------------------------------------------------- Wed Jan 19 13:49:48 CET 2011 - jsrain(a)suse.cz - adaptations for unattended migration (fate#310481) -- 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] r63919 - in /trunk/storage/storage/src/include: ep-tmpfs-dialogs.ycp ep-tmpfs-lib.ycp ep-tmpfs.ycp
by fehr＠svn2.opensuse.org 06 May '11

06 May '11

Author: fehr Date: Fri May 6 11:58:29 2011 New Revision: 63919 URL: http://svn.opensuse.org/viewcvs/yast?rev=63919&view=rev Log: add new files for tmps support Added: trunk/storage/storage/src/include/ep-tmpfs-dialogs.ycp trunk/storage/storage/src/include/ep-tmpfs-lib.ycp trunk/storage/storage/src/include/ep-tmpfs.ycp Added: trunk/storage/storage/src/include/ep-tmpfs-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-t… ============================================================================== --- trunk/storage/storage/src/include/ep-tmpfs-dialogs.ycp (added) +++ trunk/storage/storage/src/include/ep-tmpfs-dialogs.ycp Fri May 6 11:58:29 2011 @@ -0,0 +1,34 @@ +/** + * File: ep-tmpfs-dialogs.ycp + * Package: yast2-storage + * Summary: Expert Partitioner + * Authors: Thomas Fehr <fehr(a)suse.de> + * + * This file must only be included in other Expert Partitioner files ("ep-*.ycp"). + */ +{ + textdomain "storage"; + + +boolean DlgCreateTmpfs(map<string, any> &data) + { + map<string, any> aliases = $[ + "FormatMount" : ``(MiniWorkflowStepFormatMount(data)) + ]; + + map<string, any> sequence = $[ + "FormatMount" : $[ `finish : `finish ], + ]; + + // dialog title + string title = _("Add Tmpfs Mount"); + + symbol widget = MiniWorkflow::Run(title, StorageIcons::dm_icon, aliases, sequence, "FormatMount"); + + return widget == `finish; + } + + + + +} Added: trunk/storage/storage/src/include/ep-tmpfs-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-t… ============================================================================== --- trunk/storage/storage/src/include/ep-tmpfs-lib.ycp (added) +++ trunk/storage/storage/src/include/ep-tmpfs-lib.ycp Fri May 6 11:58:29 2011 @@ -0,0 +1,51 @@ +/** + * File: ep-tmpfs-lib.ycp + * Package: yast2-storage + * Summary: Expert Partitioner + * Authors: Thomas Fehr <fehr(a)suse.de> + * + * This file must only be included in other Expert Partitioner files ("ep-*.ycp"). + */ +{ + textdomain "storage"; + + +void EpDeleteTmpfsDevice(string device) + { + if (device == nil) + { + // error popup + Popup::Error(_("No TMPFS device selected.")); + return; + } + + list<string> tmp = splitstring(device,":"); + string mount = tmp[1]:""; + y2milestone( "EpDeleteTmpfsDevice device:%1 mount:%2", device, mount ); + // YesNo popup. %1 is path to a file + if( Popup::YesNo( sformat(_("\nReally delete tmpfs mounted to %1"), mount )) && + Storage::DelTmpfsVolume( mount )) + { + any new_focus = nil; + if (UI::QueryWidget(`tree, `CurrentItem) == device) + new_focus = `tmpfs; + UpdateMainStatus(); + UpdateNavigationTree(new_focus); + TreePanel::Create(); + } + } + +void EpAddTmpfsDevice() + { + map<string, any> data = $[ "device":"tmpfs", "fstype":"TMPFS", "format":true, + "type":`tmpfs, "detected_fs":`tmpfs, "used_fs":`tmpfs ]; + if( DlgCreateTmpfs(data) ) + { + y2milestone( "EpAddTmpfsDevice data:%1", data ); + Storage::AddTmpfsVolume( data["mount"]:"", data["fstopt"]:"" ); + UpdateMainStatus(); + UpdateNavigationTree(nil); + TreePanel::Create(); + } + } +} Added: trunk/storage/storage/src/include/ep-tmpfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-t… ============================================================================== --- trunk/storage/storage/src/include/ep-tmpfs.ycp (added) +++ trunk/storage/storage/src/include/ep-tmpfs.ycp Fri May 6 11:58:29 2011 @@ -0,0 +1,184 @@ +/** + * File: ep-tmpfs.ycp + * Package: yast2-storage + * Summary: Expert Partitioner + * Authors: Thomas Fehr <fehr(a)suse.de> + * + * This file must only be included in other Expert Partitioner files ("ep-*.ycp"). + */ +{ + textdomain "storage"; + + include "partitioning/ep-tmpfs-dialogs.ycp"; + include "partitioning/ep-tmpfs-lib.ycp"; + + + void EpContextMenuTmpfs(string device) + { + symbol widget = ContextMenu::Simple([ `item(`id(`delete), _("Delete")) ]); + + switch (widget) + { + case `delete: + EpDeleteTmpfsDevice(device); + break; + } + } + + void HandleTmpfsButtons( any user_data, string device, map event ) + { + y2milestone( "HandleTmpfsButtons device:%1 user_data:%2 event:%3", + device, event, user_data ); + string disk_device = ""; + + if (user_data == 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"]:""; + } + else + { + disk_device = (string) user_data; + } + + switch (Event::IsWidgetActivated(event)) + { + case `delete: + EpDeleteTmpfsDevice(device); + break; + + case `add: + EpAddTmpfsDevice(); + break; + } + } + + void CreateTmpfsMainPanel(any user_data) + { + list<symbol> fields = StorageSettings::FilterTable([ `size, `type, + `fs_type, `mount_point ]); + + map<string, map> target_map = Storage::GetTargetMap(); + term table_header = StorageFields::TableHeader(fields); + list<term> table_contents = StorageFields::TableContents(fields, target_map, StorageFields::PredicateTmpfs); + UI::ReplaceWidget(`tree_panel, + Greasemonkey::Transform( + `VBox( + `HStretch(), + // heading + `IconAndHeading(_("Tmpfs Volumes (TMPFS)"), StorageIcons::dm_icon ), + `Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu), + table_header, table_contents), + ArrangeButtons([ // push button text + `PushButton(`id(`add),`opt(`key_F3), _("Add...")), + // push button text + `PushButton(`id(`delete),`opt(`key_F5), _("Delete...")), + `HStretch() ]) + ) + )); + + // helptext + string helptext = _("<p>This view shows all TMPFS volumes.</p>"); + + Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); + } + + void HandleTmpfsMainPanel(any user_data, map event) + { + string device = (string) UI::QueryWidget(`id(`table), `CurrentItem); + HandleTmpfsButtons( user_data, device, event ); + switch (Event::IsWidgetContextMenuActivated(event)) + { + case `table: + EpContextMenuDevice(device); + break; + } + UI::SetFocus(`id(`table)); + } + + + void CreateTmpfsOverviewTab(any user_data) + { + string device = (string) user_data; + y2milestone( "CreateTmpfsOverviewTab user_data:%1", user_data ); + + map<string, map> target_map = Storage::GetTargetMap(); + + list<symbol> fields = StorageSettings::FilterOverview([ `heading_device, `device, `size, `used_by, + `heading_filesystem, `fs_type, `mount_point, + `mount_by ]); + + UI::ReplaceWidget(`tab_panel, + Greasemonkey::Transform( + `VBox( + StorageFields::Overview(fields, target_map, device), + `HBox( + // push button text + `PushButton(`id(`delete), _("Delete...")), + `HStretch() + ) + ) + ) + ); + + // helptext + string helptext = _("<p>This view shows detailed information about the +selected TMPFS volume.</p>"); + + Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields)); + } + + + void HandleTmpfsOverviewTab(any user_data, map event) + { + string device = (string) user_data; + y2milestone( "HandleTmpfsOverviewTab user_data:%1", user_data ); + + switch (Event::IsWidgetActivated(event)) + { + case `add: + EpAddTmpfsDevice(); + break; + case `delete: + EpDeleteTmpfsDevice(device); + break; + } + } + + + void CreateTmpfsPanel(any user_data) + { + string device = (string) user_data; + y2milestone( "CreateTmpfsPanel user_data:%1 device:%2", user_data, device ); + + map<symbol, map> data = $[ `overview : $[ `create : CreateTmpfsOverviewTab, `handle : HandleTmpfsOverviewTab, `user_data : user_data ] + ]; + + UI::ReplaceWidget(`tree_panel, + Greasemonkey::Transform( + `VBox( + // heading + `IconAndHeading(sformat(_("Tmpfs mounted at %1"), device), StorageIcons::lvm_lv_icon), + `DumbTab(`id(`tab), [ + // push button text + `item(`id(`overview), _("&Overview")) + ], + `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) + ) + ) + ) + ); + + TabPanel::Init(data, `overview); + } + + + void HandleTmpfsPanel(any user_data, map event) + { + TabPanel::Handle(event); + } +} -- 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] r63918 - in /branches/SuSE-Code-11-SP2-Branch/core: libycp/src/ libycp/src/include/ycp/ libycp/testsuite/tests/builtin/ package/
by aschnell＠svn2.opensuse.org 06 May '11

06 May '11

Author: aschnell Date: Fri May 6 11:05:14 2011 New Revision: 63918 URL: http://svn.opensuse.org/viewcvs/yast?rev=63918&view=rev Log: - backported isempty and tosymbol builtins needed by storage Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinSymbol.cc branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPBuiltinSymbol.h branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/Makefile.am branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YBuiltin.cc branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinList.cc branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinMap.cc branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinString.cc branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPMap.cc branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPString.cc branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/Makefile.am branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPMap.h branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPString.h branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.err branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.out branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.err branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.out branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.ycp branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/Makefile.am Fri May 6 11:05:14 2011 @@ -45,7 +45,7 @@ YCPBuiltinList.cc YCPBuiltinBoolean.cc \ YCPBuiltinString.cc YCPBuiltinTerm.cc \ YCPBuiltinVoid.cc YCPBuiltinMap.cc \ - YCPBuiltinMisc.cc \ + YCPBuiltinMisc.cc YCPBuiltinSymbol.cc \ YCPBuiltinMultiset.cc \ YSymbolEntry.cc \ TypeStatics.cc \ Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YBuiltin.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YBuiltin.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YBuiltin.cc Fri May 6 11:05:14 2011 @@ -53,6 +53,9 @@ #include "ycp/YCPBuiltinMultiset.h" static YCPBuiltinMultiset builtin_multiset; // trigger constructor +#include "ycp/YCPBuiltinSymbol.h" +static YCPBuiltinSymbol builtin_symbol; // trigger constructor + #include "ycp/YCPBuiltinMap.h" static YCPBuiltinMap builtin_map; // trigger constructor Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinList.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinList.cc Fri May 6 11:05:14 2011 @@ -914,6 +914,27 @@ } +static YCPValue +l_isempty(const YCPList& l) +{ + /** + * @builtin isempty + * @id isempty-list + * @short Returns whether the list <tt>l</tt> is empty. + * @param list l List + * @return boolean Emptiness of list <tt>l</tt> + * + * @description + * Notice that the list <tt>l</tt> must not be nil. + * + * @usage isempty([]) -> true + * @usage isempty([19, 29]) -> false + */ + + return YCPBoolean(l->isEmpty()); +} + + // parameter is YCPValue because we accept 'nil' static YCPValue l_size (const YCPValue &list) @@ -1352,6 +1373,7 @@ { "add", "list <flex> (const list <flex>, const flex)", (void *)l_add, DECL_FLEX|DECL_NIL }, { "+", "list <flex> (const list <flex>, const flex)", (void *)l_add, DECL_FLEX }, { "+", "list <any> (const list <any>, any)", (void *)l_add }, + { "isempty", "boolean (const list <any>)", (void *)l_isempty }, { "size", "integer (const list <any>)", (void *)l_size, DECL_NIL }, { "remove", "list <flex> (const list <flex>, const integer)", (void *)l_remove, DECL_FLEX }, { "select", "flex (const list <flex>, integer, flex)", (void *)l_select, DECL_NIL|DECL_FLEX }, Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinMap.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinMap.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinMap.cc Fri May 6 11:05:14 2011 @@ -361,6 +361,27 @@ } +static YCPValue +m_isempty(const YCPMap& m) +{ + /** + * @builtin isempty + * @id isempty-map + * @short Returns whether the map <tt>m</tt> is empty. + * @param map m Map + * @return boolean Emptiness of map <tt>m</tt> + * + * @description + * Notice that the map <tt>m</tt> must not be nil. + * + * @usage isempty($[]) -> true + * @usage isempty($[ `host : "pandora" ]) -> false + */ + + return YCPBoolean(m->isEmpty()); +} + + // parameter is YCPValue because we accept 'nil' static YCPValue m_size (const YCPValue &map) @@ -547,6 +568,7 @@ { "+", "map <any,any> (const map <any,any>, const map <any,any>)", (void *)m_unionmap }, { "add", "map <flex1,flex2> (const map <flex1,flex2>, const flex1, const flex2)", (void *)m_addmap, DECL_FLEX }, { "change", "map <flex1,flex2> (const map <flex1,flex2>, const flex1, const flex2)", (void *)m_changemap,DECL_FLEX|DECL_DEPRECATED }, + { "isempty", "boolean (const map <any,any>)", (void *)m_isempty }, { "size", "integer (const map <any,any>)", (void *)m_size, DECL_NIL }, { "foreach","flex1 (variable <flex2>, variable <flex3>, const map <flex2,flex3>, const block <flex1>)", (void *)m_foreach, DECL_LOOP|DECL_SYMBOL|DECL_FLEX }, { "tomap", "map <any,any> (const any)", (void *)m_tomap, DECL_FLEX }, Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinString.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinString.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinString.cc Fri May 6 11:05:14 2011 @@ -58,6 +58,27 @@ static YCPValue +s_isempty(const YCPString& s) +{ + /** + * @builtin isempty + * @id isempty-string + * @short Returns whether the string <tt>s</tt> is empty. + * @param string s String + * @return boolean Emptiness of string <tt>s</tt> + * + * @description + * Notice that the string <tt>s</tt> must not be nil. + * + * @usage isempty("") -> true + * @usage isempty("test") -> false + */ + + return YCPBoolean(s->isEmpty()); +} + + +static YCPValue s_size (const YCPString &s) { /** @@ -1562,6 +1583,7 @@ { "tostring", "string (any)", (void *)s_tostring }, { "tohexstring", "string (integer)", (void *)s_tohexstring1 }, { "tohexstring", "string (integer, integer)", (void *)s_tohexstring2 }, + { "isempty", "boolean (string)", (void *)s_isempty }, { "size", "integer (string)", (void *)s_size }, { "find", "integer (string, string)", (void *)s_find, DECL_DEPRECATED }, { "search", "integer (string, string)", (void *)s_search }, Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinSymbol.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinSymbol.cc (added) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinSymbol.cc Fri May 6 11:05:14 2011 @@ -0,0 +1,61 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE Linux AG | +\----------------------------------------------------------------------/ + + File: YCPBuiltinSymbol.cc + Summary: YCP Symbol Builtins + + Authors: Arvin Schnell <aschnell(a)suse.de> + Maintainer: Arvin Schnell <aschnell(a)suse.de> + +/-*/ + +#include "ycp/YCPBuiltinSymbol.h" +#include "ycp/YCPSymbol.h" +#include "ycp/YCPString.h" +#include "ycp/YCPInteger.h" +#include "ycp/YCPVoid.h" +#include "ycp/YCPBoolean.h" +#include "ycp/YCPCode.h" +#include "ycp/YCPCodeCompare.h" +#include "ycp/StaticDeclaration.h" + +#include "ycp/y2log.h" + +extern StaticDeclaration static_declarations; + + +static YCPValue +s_tosymbol (const YCPString& v) +{ + /* @builtin tosymbol + * @short Converts a string to a symbol. + * + * @param string VALUE + * @return symbol + * + * @usage tosymbol("test") -> `test + */ + + return YCPSymbol(v->value()); +} + + +YCPBuiltinSymbol::YCPBuiltinSymbol () +{ + // must be static, registerDeclarations saves a pointer to it! + static declaration_t declarations[] = { + { "tosymbol", "symbol (const string)", (void*) s_tosymbol }, + { 0 } + }; + + static_declarations.registerDeclarations ("YCPBuiltinSymbol", declarations); +} Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPMap.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPMap.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPMap.cc Fri May 6 11:05:14 2011 @@ -113,6 +113,13 @@ } +bool +YCPMapRep::isEmpty() const +{ + return stl_map.empty(); +} + + long YCPMapRep::size() const { Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPString.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPString.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPString.cc Fri May 6 11:05:14 2011 @@ -33,6 +33,14 @@ { } + +bool +YCPStringRep::isEmpty() const +{ + return v.empty(); +} + + string YCPStringRep::value() const { Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/Makefile.am Fri May 6 11:05:14 2011 @@ -19,7 +19,7 @@ YCPDebugger.h \ Type.h TypePtr.h \ YCPBuiltinBoolean.h YCPBuiltinFloat.h \ - YCPBuiltinByteblock.h \ + YCPBuiltinByteblock.h YCPBuiltinSymbol.h \ YCPBuiltinInteger.h YCPBuiltinList.h \ YCPBuiltinMap.h YCPBuiltinMisc.h \ YCPBuiltinPath.h YCPBuiltinString.h \ Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPBuiltinSymbol.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPBuiltinSymbol.h (added) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPBuiltinSymbol.h Fri May 6 11:05:14 2011 @@ -0,0 +1,34 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YCPBuiltinSymbol.h + + Author: Arvin Schnell <aschnell(a)suse.de> + Maintainer: Arvin Schnell <aschnell(a)suse.de> + +/-*/ +// -*- c++ -*- + + +#ifndef YCPBuiltinSymbol_h +#define YCPBuiltinSymbol_h + +class YCPBuiltinSymbol +{ + +public: + YCPBuiltinSymbol(); + +}; + + +#endif // YCPBuiltinSymbol_h Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPMap.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPMap.h (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPMap.h Fri May 6 11:05:14 2011 @@ -82,6 +82,11 @@ void remove(const YCPValue& key); /** + * Returns true, iff this map is empty. + */ + bool isEmpty() const; + + /** * Returns the number of key/value pairs. */ long size() const; @@ -212,6 +217,7 @@ void add(const YCPValue& key, const YCPValue& value) { ELEMENT->add (key,value); } YCPMap functionalAdd(const YCPValue& key, const YCPValue& value) const { return CONST_ELEMENT-> functionalAdd (key,value); } void remove(const YCPValue& key) { ELEMENT-> remove (key); } + bool isEmpty() const { return CONST_ELEMENT->isEmpty(); } long size() const { return CONST_ELEMENT-> size (); } YCPValue value(const YCPValue& key) const { return CONST_ELEMENT-> value (key); } YCPMapIterator begin() const { return CONST_ELEMENT-> begin (); } Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPString.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPString.h (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPString.h Fri May 6 11:05:14 2011 @@ -53,6 +53,12 @@ YCPStringRep(string s); public: + + /** + * Returns true, iff this string is empty. + */ + bool isEmpty() const; + /** * Returns the value of this object in form of a C++ * string value. Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.err (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.err Fri May 6 11:05:14 2011 @@ -124,6 +124,23 @@ ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- +"** isempty **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty ([]) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty ([1, 2, 3]) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty (nil) +---------------------------------------------------------------------- +[Interpreter] tests/builtin/Builtin-List2.ycp:72 Argument (nil) to isempty(...) is nil +Parsed: +---------------------------------------------------------------------- "** size **" ---------------------------------------------------------------------- Parsed: @@ -166,12 +183,12 @@ ---------------------------------------------------------------------- "** change **" ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:90 Warning: change(...) is deprecated, please fix +[Parser] tests/builtin/Builtin-List2.ycp:97 Warning: change(...) is deprecated, please fix Parsed: ---------------------------------------------------------------------- change ([1, 4], 8) ---------------------------------------------------------------------- -[libycp] tests/builtin/Builtin-List2.ycp:90 Change does not work as expected! The argument is not passed by reference. +[libycp] tests/builtin/Builtin-List2.ycp:97 Change does not work as expected! The argument is not passed by reference. Parsed: ---------------------------------------------------------------------- "** remove **" @@ -184,34 +201,34 @@ ---------------------------------------------------------------------- remove ([], 0) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-List2.ycp:96 Index 0 for remove () out of range +[Interpreter] tests/builtin/Builtin-List2.ycp:103 Index 0 for remove () out of range Parsed: ---------------------------------------------------------------------- "** select **" ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:101 Warning: 'select ()' is deprecated +[Parser] tests/builtin/Builtin-List2.ycp:108 Warning: 'select ()' is deprecated Parsed: ---------------------------------------------------------------------- [1, 2][-1]:42 ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:102 Warning: 'select ()' is deprecated +[Parser] tests/builtin/Builtin-List2.ycp:109 Warning: 'select ()' is deprecated Parsed: ---------------------------------------------------------------------- [1, 2][0]:42 ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:103 Warning: 'select ()' is deprecated +[Parser] tests/builtin/Builtin-List2.ycp:110 Warning: 'select ()' is deprecated Parsed: ---------------------------------------------------------------------- [1, 2][1]:42 ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:104 Warning: 'select ()' is deprecated +[Parser] tests/builtin/Builtin-List2.ycp:111 Warning: 'select ()' is deprecated Parsed: ---------------------------------------------------------------------- [1, 2][3]:42 ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:105 Warning: 'select ()' is deprecated +[Parser] tests/builtin/Builtin-List2.ycp:112 Warning: 'select ()' is deprecated Parsed: ---------------------------------------------------------------------- /* any -> string */[1, "two"][0]:"wrong type" ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-List2.ycp:96 Can't convert value '1' to type 'string' +[Interpreter] tests/builtin/Builtin-List2.ycp:103 Can't convert value '1' to type 'string' Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.out (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.out Fri May 6 11:05:14 2011 @@ -27,6 +27,10 @@ ([true, 1, 1, 2]) ([8, 6, 3, 2]) ([8, 6, 3, 2]) +("** isempty **") +(true) +(false) +(nil) ("** size **") (0) (3) Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp Fri May 6 11:05:14 2011 @@ -65,6 +65,13 @@ (sort (`x, `y, [ 3, 6, 2, 8 ], ``(x>y))) +("** isempty **") + +(isempty ([])) +(isempty ([1, 2, 3])) +(isempty ((list) nil)) + + ("** size **") (size ([])) Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp Fri May 6 11:05:14 2011 @@ -75,6 +75,13 @@ (add ($[`a: 17, `b: 11], `b, nil)) +("** isempty **") + +(isempty ($[])) +(isempty ($[1:"a", 2:"b"])) +(isempty ((map) nil)) + + ("** size **") (size ($[])) Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.err (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.err Fri May 6 11:05:14 2011 @@ -1,5 +1,22 @@ Parsed: ---------------------------------------------------------------------- +"** isempty **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty ("") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty ("linux") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty (nil) +---------------------------------------------------------------------- +[Interpreter] tests/builtin/Builtin-String.ycp:15 Argument (nil) to isempty(...) is nil +Parsed: +---------------------------------------------------------------------- "** size **" ---------------------------------------------------------------------- Parsed: @@ -94,7 +111,7 @@ ---------------------------------------------------------------------- substring ("some text", 42) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-String.ycp:48 Substring index out of range +[Interpreter] tests/builtin/Builtin-String.ycp:55 Substring index out of range Parsed: ---------------------------------------------------------------------- substring ("some text", 5, 2) @@ -103,7 +120,7 @@ ---------------------------------------------------------------------- substring ("some text", 42, 2) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-String.ycp:51 Substring index out of range +[Interpreter] tests/builtin/Builtin-String.ycp:58 Substring index out of range Parsed: ---------------------------------------------------------------------- "** lsubstring **" @@ -116,7 +133,7 @@ ---------------------------------------------------------------------- lsubstring ("some text", 42) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-String.ycp:57 Substring index out of range +[Interpreter] tests/builtin/Builtin-String.ycp:64 Substring index out of range Parsed: ---------------------------------------------------------------------- lsubstring ("ÄÅ¡ÄÅÅ¾Ã½Ã¡Ã", 5) @@ -129,7 +146,7 @@ ---------------------------------------------------------------------- lsubstring ("some text", 42, 2) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-String.ycp:61 Substring index out of range +[Interpreter] tests/builtin/Builtin-String.ycp:68 Substring index out of range Parsed: ---------------------------------------------------------------------- lsubstring ("ÄÅ¡ÄÅÅ¾Ã½Ã¡Ã", 5, 2) @@ -146,9 +163,9 @@ ---------------------------------------------------------------------- mergestring (["abc", "dev", "ghi", ""], "/") ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-String.ycp:69 No match for 'mergestring : <unspec> (list, string)' -[Parser] tests/builtin/Builtin-String.ycp:69 Please fix parameter types to match one of: -[Parser] tests/builtin/Builtin-String.ycp:69 'mergestring : string (const list <string>, string)' -[Parser] tests/builtin/Builtin-String.ycp:69 Wrong parameters in call to mergestring(...) -[Parser] tests/builtin/Builtin-String.ycp:69 Expected '(const list <string>, string)', seen '(list, string)'. +[Parser] tests/builtin/Builtin-String.ycp:76 No match for 'mergestring : <unspec> (list, string)' +[Parser] tests/builtin/Builtin-String.ycp:76 Please fix parameter types to match one of: +[Parser] tests/builtin/Builtin-String.ycp:76 'mergestring : string (const list <string>, string)' +[Parser] tests/builtin/Builtin-String.ycp:76 Wrong parameters in call to mergestring(...) +[Parser] tests/builtin/Builtin-String.ycp:76 Expected '(const list <string>, string)', seen '(list, string)'. runycp: parser error Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.out (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.out Fri May 6 11:05:14 2011 @@ -1,3 +1,7 @@ +("** isempty **") +(true) +(false) +(nil) ("** size **") (0) (5) Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-String.ycp Fri May 6 11:05:14 2011 @@ -8,6 +8,13 @@ # --------------------------------------------------------- +("** isempty **") + +(isempty ("")) +(isempty ("linux")) +(isempty ((string) nil)) + + ("** size **") (size ("")) Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err (added) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err Fri May 6 11:05:14 2011 @@ -0,0 +1,13 @@ +Parsed: +---------------------------------------------------------------------- +"** tosymbol **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +tosymbol ("test") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +tosymbol (nil) +---------------------------------------------------------------------- +[Interpreter] tests/builtin/Builtin-Symbol.ycp:14 Argument (nil) to tosymbol(...) is nil Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out (added) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out Fri May 6 11:05:14 2011 @@ -0,0 +1,3 @@ +("** tosymbol **") +(`test) +(nil) Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp Fri May 6 11:05:14 2011 @@ -0,0 +1,15 @@ + +# --------------------------------------------------------- +# +# Filename: Builtin-Symbol.ycp +# +# Purpose: test cases for all symbol builtins +# +# --------------------------------------------------------- + + +("** tosymbol **") + +(tosymbol ("test")) +(tosymbol (nil)) + Modified: branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes Fri May 6 11:05:14 2011 @@ -2,6 +2,7 @@ Thu May 05 17:24:04 CEST 2011 - aschnell(a)suse.de - backported multiset builtins needed by storage and iscsi +- backported isempty and tosymbol builtins needed by storage - 2.17.37 ------------------------------------------------------------------- -- 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] r63917 - /trunk/snapper/agent-snapper/src/SnapperAgent.cc
by jsuchome＠svn2.opensuse.org 06 May '11

06 May '11

Author: jsuchome Date: Fri May 6 08:19:45 2011 New Revision: 63917 URL: http://svn.opensuse.org/viewcvs/yast?rev=63917&view=rev Log: do not call deleteSnapper if initialization failed Modified: trunk/snapper/agent-snapper/src/SnapperAgent.cc Modified: trunk/snapper/agent-snapper/src/SnapperAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/agent-snapper/src/Snappe… ============================================================================== --- trunk/snapper/agent-snapper/src/SnapperAgent.cc (original) +++ trunk/snapper/agent-snapper/src/SnapperAgent.cc Fri May 6 08:19:45 2011 @@ -86,6 +86,7 @@ */ SnapperAgent::SnapperAgent() : SCRAgent() { + sh = NULL; snapper_initialized = false; snapper_error = ""; } @@ -309,12 +310,14 @@ { y2error ("Config not found."); snapper_error = "config_not_found"; + sh = NULL; return YCPBoolean (false); } catch (const InvalidConfigException& e) { y2error ("Config is invalid."); snapper_error = "config_invalid"; + sh = NULL; return YCPBoolean (false); } snapper_initialized = true; -- 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] r63916 - in /trunk/snapper/agent-snapper/src: SnapperAgent.cc SnapperAgent.h
by jsuchome＠svn2.opensuse.org 05 May '11

05 May '11

Author: jsuchome Date: Thu May 5 17:43:20 2011 New Revision: 63916 URL: http://svn.opensuse.org/viewcvs/yast?rev=63916&view=rev Log: added initialziation code Modified: trunk/snapper/agent-snapper/src/SnapperAgent.cc trunk/snapper/agent-snapper/src/SnapperAgent.h Modified: trunk/snapper/agent-snapper/src/SnapperAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/agent-snapper/src/Snappe… ============================================================================== --- trunk/snapper/agent-snapper/src/SnapperAgent.cc (original) +++ trunk/snapper/agent-snapper/src/SnapperAgent.cc Thu May 5 17:43:20 2011 @@ -86,7 +86,8 @@ */ SnapperAgent::SnapperAgent() : SCRAgent() { - sh = createSnapper(); + snapper_initialized = false; + snapper_error = ""; } /** @@ -94,7 +95,10 @@ */ SnapperAgent::~SnapperAgent() { - deleteSnapper(sh); + if (sh) + { + deleteSnapper(sh); + } } @@ -133,14 +137,21 @@ YCPMap argmap; if (!arg.isNull() && arg->isMap()) argmap = arg->asMap(); + + if (!snapper_initialized && PC(0) != "error") { + y2error ("snapper not initialized: use Execute (.snapper) first!"); + snapper_error = "not_initialized"; + return YCPVoid(); + } if (path->length() == 1) { /** - * error: Read(.snapper.error) -> returns last error message + * error: Read (.snapper.error) -> returns last error message */ if (PC(0) == "error") { YCPMap retmap; + retmap->add (YCPString ("type"), YCPString (snapper_error)); return retmap; } /** @@ -286,6 +297,36 @@ if (!arg.isNull() && arg->isMap()) argmap = arg->asMap(); + /** + * Execute (.snapper) call: Initialize snapper object + */ + if (path->length() == 0) { + + try { + sh = createSnapper(); + } + catch (const ConfigNotFoundException& e) + { + y2error ("Config not found."); + snapper_error = "config_not_found"; + return YCPBoolean (false); + } + catch (const InvalidConfigException& e) + { + y2error ("Config is invalid."); + snapper_error = "config_invalid"; + return YCPBoolean (false); + } + snapper_initialized = true; + return ret; + } + + if (!snapper_initialized) { + y2error ("snapper not initialized: use Execute (.snapper) first!"); + snapper_error = "not_initialized"; + return YCPVoid(); + } + if (path->length() == 1) { /** Modified: trunk/snapper/agent-snapper/src/SnapperAgent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/agent-snapper/src/Snappe… ============================================================================== --- trunk/snapper/agent-snapper/src/SnapperAgent.h (original) +++ trunk/snapper/agent-snapper/src/SnapperAgent.h Thu May 5 17:43:20 2011 @@ -29,6 +29,10 @@ * Agent private variables and methods */ + snapper::Snapper* sh; + bool snapper_initialized; + string snapper_error; + /** * search the map for value of given key; both key and value have to be strings * when key is not present, empty string is returned @@ -92,11 +96,6 @@ * Used for mounting the agent. */ virtual YCPValue otherCommand(const YCPTerm& term); - -private: - - snapper::Snapper* sh; - }; #endif /* _SnapperAgent_h */ -- 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] r63915 - /trunk/snapper/src/Snapper.ycp
by jsuchome＠svn2.opensuse.org 05 May '11

05 May '11

Author: jsuchome Date: Thu May 5 17:42:45 2011 New Revision: 63915 URL: http://svn.opensuse.org/viewcvs/yast?rev=63915&view=rev Log: call initialization first Modified: trunk/snapper/src/Snapper.ycp Modified: trunk/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/Snapper.ycp?rev=6391… ============================================================================== --- trunk/snapper/src/Snapper.ycp (original) +++ trunk/snapper/src/Snapper.ycp Thu May 5 17:42:45 2011 @@ -37,6 +37,7 @@ import "FileUtils"; import "Label"; import "Progress"; +import "Report"; // global list of all snapshot @@ -163,6 +164,41 @@ return true; } +global map LastSnapperErrorMap () { + + return (map) SCR::Read (.snapper.error); +} + +/** + * Initialize snapper agent + * Return true on success + */ +global boolean InitializeSnapper () { + + boolean init = (boolean) SCR::Execute (.snapper); + if (!init) + { + map err_map = LastSnapperErrorMap (); + string type = err_map["type"]:""; + string details = _("Reason not known."); + if (type == "config_not_found") + { + details = _("Configuration not found."); + } + else if (type == "config_invalid") + { + details = _("Configuration is not valid."); + } + + y2warning ("init failed with '%1'", err_map); + // error popup + Report::Error (sformat (_("Failed to initialize snapper library: +%1"), details)); + } + return init; + +} + /** * Read all snapper settings * @return true on success @@ -188,7 +224,11 @@ ); Progress::NextStage(); - // read database + + if (!InitializeSnapper ()) + { + return false; + } ReadSnapshots (); -- 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] r63914 - in /branches/SuSE-Code-11-SP2-Branch/core: ./ libycp/src/ libycp/src/include/ycp/ libycp/testsuite/tests/builtin/ package/
by aschnell＠svn2.opensuse.org 05 May '11

05 May '11

Author: aschnell Date: Thu May 5 17:26:20 2011 New Revision: 63914 URL: http://svn.opensuse.org/viewcvs/yast?rev=63914&view=rev Log: - backported multiset builtins needed by storage and iscsi Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinMultiset.cc branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPBuiltinMultiset.h branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Multiset.err branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Multiset.out branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Multiset.ycp Modified: branches/SuSE-Code-11-SP2-Branch/core/VERSION branches/SuSE-Code-11-SP2-Branch/core/libycp/src/Makefile.am branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YBuiltin.cc branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPList.cc branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/Makefile.am branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPList.h branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes Modified: branches/SuSE-Code-11-SP2-Branch/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/core/VERSION Thu May 5 17:26:20 2011 @@ -1 +1 @@ -2.17.36 +2.17.37 Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/Makefile.am Thu May 5 17:26:20 2011 @@ -46,6 +46,7 @@ YCPBuiltinString.cc YCPBuiltinTerm.cc \ YCPBuiltinVoid.cc YCPBuiltinMap.cc \ YCPBuiltinMisc.cc \ + YCPBuiltinMultiset.cc \ YSymbolEntry.cc \ TypeStatics.cc \ y2string.cc \ Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YBuiltin.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YBuiltin.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YBuiltin.cc Thu May 5 17:26:20 2011 @@ -50,6 +50,9 @@ #include "ycp/YCPBuiltinList.h" static YCPBuiltinList builtin_list; // trigger constructor +#include "ycp/YCPBuiltinMultiset.h" +static YCPBuiltinMultiset builtin_multiset; // trigger constructor + #include "ycp/YCPBuiltinMap.h" static YCPBuiltinMap builtin_map; // trigger constructor Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinMultiset.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinMultiset.cc (added) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPBuiltinMultiset.cc Thu May 5 17:26:20 2011 @@ -0,0 +1,120 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE Linux GmbH | +\----------------------------------------------------------------------/ + + File: YCPBuiltinMultiset.cc + Summary: YCP Multiset Builtins + + Authors: Arvin Schnell <aschnell(a)suse.de> + Maintainer: Arvin Schnell <aschnell(a)suse.de> + +/-*/ + +#include <algorithm> + +#include "ycp/YCPBuiltinMultiset.h" +#include "ycp/YCPList.h" +#include "ycp/YCPBoolean.h" +#include "ycp/YCPVoid.h" +#include "ycp/YCPCode.h" +#include "ycp/YCPCodeCompare.h" +#include "ycp/StaticDeclaration.h" + +#include "ycp/y2log.h" + +extern StaticDeclaration static_declarations; + + +static YCPValue +ms_includes(const YCPList& a, const YCPList& b) +{ + // see http://www.sgi.com/tech/stl/includes.html + + return YCPBoolean(includes(a->begin(), a->end(), b->begin(), b->end(), ycpless())); +} + + +static YCPValue +ms_difference(const YCPList& a, const YCPList& b) +{ + // see http://www.sgi.com/tech/stl/set_difference.html + + YCPList ret; + back_insert_iterator<YCPList> bii(ret); + set_difference(a->begin(), a->end(), b->begin(), b->end(), bii, ycpless()); + return ret; +} + + +static YCPValue +ms_symmetric_difference(const YCPList& a, const YCPList& b) +{ + // see http://www.sgi.com/tech/stl/set_symmetric_difference.html + + YCPList ret; + back_insert_iterator<YCPList> bii(ret); + set_symmetric_difference(a->begin(), a->end(), b->begin(), b->end(), bii, ycpless()); + return ret; +} + + +static YCPValue +ms_intersection(const YCPList& a, const YCPList& b) +{ + // see http://www.sgi.com/tech/stl/set_intersection.html + + YCPList ret; + back_insert_iterator<YCPList> bii(ret); + set_intersection(a->begin(), a->end(), b->begin(), b->end(), bii, ycpless()); + return ret; +} + + +static YCPValue +ms_union(const YCPList& a, const YCPList& b) +{ + // see http://www.sgi.com/tech/stl/set_union.html + + YCPList ret; + back_insert_iterator<YCPList> bii(ret); + set_union(a->begin(), a->end(), b->begin(), b->end(), bii, ycpless()); + return ret; +} + + +static YCPValue +ms_merge(const YCPList& a, const YCPList& b) +{ + // see http://www.sgi.com/tech/stl/merge.html + + YCPList ret; + back_insert_iterator<YCPList> bii(ret); + merge(a->begin(), a->end(), b->begin(), b->end(), bii, ycpless()); + return ret; +} + + +YCPBuiltinMultiset::YCPBuiltinMultiset() +{ + // must be static, registerDeclarations saves a pointer to it! + static declaration_t declarations_ns[] = { + { "multiset", "", NULL, DECL_NAMESPACE }, + { "includes", "boolean (const list <flex>, const list <flex>)", (void*) ms_includes, DECL_FLEX }, + { "difference", "list <flex> (const list <flex>, const list <flex>)", (void*) ms_difference, DECL_FLEX }, + { "symmetric_difference", "list <flex> (const list <flex>, const list <flex>)", (void*) ms_symmetric_difference, DECL_FLEX }, + { "intersection", "list <flex> (const list <flex>, const list <flex>)", (void*) ms_intersection, DECL_FLEX }, + { "union", "list <flex> (const list <flex>, const list <flex>)", (void*) ms_union, DECL_FLEX }, + { "merge", "list <flex> (const list <flex>, const list <flex>)", (void*) ms_merge, DECL_FLEX }, + { 0 } + }; + + static_declarations.registerDeclarations("YCPBuiltinMultiset", declarations_ns); +} Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPList.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/YCPList.cc Thu May 5 17:26:20 2011 @@ -67,6 +67,13 @@ void +YCPListRep::push_back(const YCPValue& value) +{ + elements.push_back(value); +} + + +void YCPListRep::set (const int i, const YCPValue& value) { if (i < 0) Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/Makefile.am Thu May 5 17:26:20 2011 @@ -24,6 +24,7 @@ YCPBuiltinMap.h YCPBuiltinMisc.h \ YCPBuiltinPath.h YCPBuiltinString.h \ YCPBuiltinTerm.h YCPBuiltinVoid.h \ + YCPBuiltinMultiset.h \ StaticDeclaration.h \ YCode.h YCodePtr.h \ YCPCode.h \ Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPBuiltinMultiset.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPBuiltinMultiset.h (added) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPBuiltinMultiset.h Thu May 5 17:26:20 2011 @@ -0,0 +1,34 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE Linux GmbH | +\----------------------------------------------------------------------/ + + File: YCPBuiltinMultiset.h + + Author: Arvin Schnell <aschnell(a)suse.de> + Maintainer: Arvin Schnell <aschnell(a)suse.de> + +/-*/ + + +#ifndef YCPBuiltinMultiset_h +#define YCPBuiltinMultiset_h + +class YCPBuiltinMultiset +{ + +public: + + YCPBuiltinMultiset(); + +}; + + +#endif // YCPBuiltinMultiset_h Modified: branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPList.h (original) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/src/include/ycp/YCPList.h Thu May 5 17:26:20 2011 @@ -48,6 +48,12 @@ YCPValueList elements; protected: + + typedef YCPValueList::iterator iterator; + typedef YCPValueList::const_iterator const_iterator; + typedef YCPValueList::value_type value_type; + typedef YCPValueList::const_reference const_reference; + friend class YCPList; /** @@ -84,6 +90,13 @@ void add(const YCPValue& value); /** + * Appends a value to the list. Takes over the memory management + * of that value. Use @ref YCPElementRep, if you need it + * yourself. + */ + void push_back(const YCPValue& value); + + /** * Sets a value in the list. Takes over the memory management * of that value. Use @ref YCPElementRep, if you need it * yourself. @@ -269,6 +282,12 @@ { DEF_COW_COMMON(List, Value); public: + + typedef YCPListRep::iterator iterator; + typedef YCPListRep::const_iterator const_iterator; + typedef YCPListRep::value_type value_type; + typedef YCPListRep::const_reference const_reference; + YCPList() : YCPValue(new YCPListRep()) {} YCPList(bytecodeistream & str); @@ -276,6 +295,7 @@ void reserve (int size) { ELEMENT->reserve (size); } bool isEmpty() const { return CONST_ELEMENT->isEmpty (); } void add(const YCPValue& value) { ELEMENT->add (value); } + void push_back(const YCPValue& value) { ELEMENT->push_back(value); } void set(const int n, const YCPValue& value) { ELEMENT->set (n, value); } void remove(const int n) { ELEMENT->remove (n); } void swap(int x, int y) { ELEMENT->swap (x, y); } Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Multiset.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Multiset.err (added) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Multiset.err Thu May 5 17:26:20 2011 @@ -0,0 +1,64 @@ +Parsed: +---------------------------------------------------------------------- +"** includes **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +multiset::includes ([1, 2, 3, 4, 5], [2, 3, 4]) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +multiset::includes ([1, 2, 3, 4, 5], [4, 5, 6]) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +"** difference **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +multiset::difference ([1, 2, 3], [2, 3, 4]) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +multiset::difference ([2, 3, 4], [1, 2, 3]) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +"** symmetric_difference **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +multiset::symmetric_difference ([1, 2, 3], [2, 3, 4]) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +multiset::symmetric_difference ([2, 3, 4], [1, 2, 3]) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +"** intersection **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +multiset::intersection ([1, 2, 3], [2, 3, 4]) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +multiset::intersection ([2, 3, 4], [1, 2, 3]) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +"** union **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +multiset::union ([1, 3, 5], [2, 3, 4]) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +"** merge **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +multiset::merge ([1, 3, 5], [2, 3, 4]) +---------------------------------------------------------------------- Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Multiset.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Multiset.out (added) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Multiset.out Thu May 5 17:26:20 2011 @@ -0,0 +1,16 @@ +("** includes **") +(true) +(false) +("** difference **") +([1]) +([4]) +("** symmetric_difference **") +([1, 4]) +([1, 4]) +("** intersection **") +([2, 3]) +([2, 3]) +("** union **") +([1, 2, 3, 4, 5]) +("** merge **") +([1, 2, 3, 3, 4, 5]) Added: branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Multiset.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Multiset.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/core/libycp/testsuite/tests/builtin/Builtin-Multiset.ycp Thu May 5 17:26:20 2011 @@ -0,0 +1,43 @@ + +# --------------------------------------------------------- +# +# Filename: Builtin-Multiset.ycp +# +# Purpose: test cases for all multiset builtins +# +# --------------------------------------------------------- + + +("** includes **") + +(multiset::includes ([1, 2, 3, 4, 5], [2, 3, 4])) +(multiset::includes ([1, 2, 3, 4, 5], [4, 5, 6])) + + +("** difference **") + +(multiset::difference ([1, 2, 3], [2, 3, 4])) +(multiset::difference ([2, 3, 4], [1, 2, 3])) + + +("** symmetric_difference **") + +(multiset::symmetric_difference ([1, 2, 3], [2, 3, 4])) +(multiset::symmetric_difference ([2, 3, 4], [1, 2, 3])) + + +("** intersection **") + +(multiset::intersection ([1, 2, 3], [2, 3, 4])) +(multiset::intersection ([2, 3, 4], [1, 2, 3])) + + +("** union **") + +(multiset::union ([1, 3, 5], [2, 3, 4])) + + +("** merge **") + +(multiset::merge ([1, 3, 5], [2, 3, 4])) + Modified: branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes Thu May 5 17:26:20 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 05 17:24:04 CEST 2011 - aschnell(a)suse.de + +- backported multiset builtins needed by storage and iscsi +- 2.17.37 + +------------------------------------------------------------------- Thu Mar 31 11:20:29 CEST 2011 - aschnell(a)suse.de - added sha256 and sha516 password encryption (fate #309705) -- 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] r63913 - in /branches/SuSE-Code-11-SP2-Branch/ldap-server: ./ src/wizards.ycp
by rhafer＠svn2.opensuse.org 05 May '11

05 May '11

Author: rhafer Date: Thu May 5 16:06:39 2011 New Revision: 63913 URL: http://svn.opensuse.org/viewcvs/yast?rev=63913&view=rev Log: Merged changes from trunk Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/ (props changed) branches/SuSE-Code-11-SP2-Branch/ldap-server/src/wizards.ycp Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/wizards.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/wizards.ycp Thu May 5 16:06:39 2011 @@ -127,8 +127,8 @@ "servertype" : ``( ServerTypeDialog() ), "tlssettings" : ``( TlsConfigDialog() ), "database" : ``( ProposalDialog() ), - "summary" : ``(SummaryDialog() ), - "advanced" : ``(MainSequence() ), + "summary" : ``( SummaryDialog() ), + "advanced" : ``( MainSequence() ), "write" : ``( WriteDialog() ), "slavesetup" : ``( SlaveSetupDialog() ), "mastersetup" : ``( MasterSetupDialog() ), -- 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] r63912 - /trunk/ldap-server/src/wizards.ycp
by rhafer＠svn2.opensuse.org 05 May '11

05 May '11

Author: rhafer Date: Thu May 5 16:04:06 2011 New Revision: 63912 URL: http://svn.opensuse.org/viewcvs/yast?rev=63912&view=rev Log: whitespaces Modified: trunk/ldap-server/src/wizards.ycp Modified: trunk/ldap-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/wizards.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/wizards.ycp (original) +++ trunk/ldap-server/src/wizards.ycp Thu May 5 16:04:06 2011 @@ -127,8 +127,8 @@ "servertype" : ``( ServerTypeDialog() ), "tlssettings" : ``( TlsConfigDialog() ), "database" : ``( ProposalDialog() ), - "summary" : ``(SummaryDialog() ), - "advanced" : ``(MainSequence() ), + "summary" : ``( SummaryDialog() ), + "advanced" : ``( MainSequence() ), "write" : ``( WriteDialog() ), "slavesetup" : ``( SlaveSetupDialog() ), "mastersetup" : ``( MasterSetupDialog() ), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0