January 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67206 - /tags/branch-Code-11-SP2-2_17_13/snapper/
by jsuchome＠svn2.opensuse.org 16 Jan '12

16 Jan '12

Author: jsuchome Date: Mon Jan 16 16:09:55 2012 New Revision: 67206 URL: http://svn.opensuse.org/viewcvs/yast?rev=67206&view=rev Log: Created tag branch-Code-11-SP2-2_17_13 for snapper Added: tags/branch-Code-11-SP2-2_17_13/snapper/ - copied from r67205, branches/SuSE-Code-11-SP2-Branch/snapper/ -- 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] r67205 - in /branches/SuSE-Code-11-SP2-Branch/snapper: VERSION package/yast2-snapper.changes src/Snapper.ycp src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 16 Jan '12

16 Jan '12

Author: jsuchome Date: Mon Jan 16 16:09:44 2012 New Revision: 67205 URL: http://svn.opensuse.org/viewcvs/yast?rev=67205&view=rev Log: - when reverting changes to selected snapshot, delete files as well (bnc#741214) - 2.17.13 Modified: branches/SuSE-Code-11-SP2-Branch/snapper/VERSION branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp branches/SuSE-Code-11-SP2-Branch/snapper/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/snapper/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/VERSION Mon Jan 16 16:09:44 2012 @@ -1 +1 @@ -2.17.12 +2.17.13 Modified: branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes Mon Jan 16 16:09:44 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 16 10:45:11 CET 2012 - jsuchome(a)suse.cz + +- when reverting changes to selected snapshot, delete files as well + (bnc#741214) +- 2.17.13 + +------------------------------------------------------------------- Thu Nov 24 11:52:29 CET 2011 - jsuchome(a)suse.cz - removed fixed sizes in UI, to prevent breaking Gtk (bnc#731363) Modified: branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp Mon Jan 16 16:09:44 2012 @@ -328,8 +328,10 @@ if (!FileUtils::Exists (orig)) { + SCR::Execute (.target.bash, sformat ("/bin/rm -rf -- '%1'", String::Quote (full_path))); + y2milestone ("removing '%1' from system", full_path); // log entry (%1 is file name) - UI::ChangeWidget (`id (`log), `LastLine, sformat (_("%1 does not exist in snapshot %2\n"), file, snapshot_num)); + UI::ChangeWidget (`id (`log), `LastLine, sformat (_("Deleted %1\n"), full_path)); } else if (FileUtils::CheckAndCreatePath (dir)) { Modified: branches/SuSE-Code-11-SP2-Branch/snapper/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/src/dialogs.ycp Mon Jan 16 16:09:44 2012 @@ -405,30 +405,27 @@ content = add (content, `VStretch ()); } + // button label + string restore_label = _("R&estore From First"); + // button label + string restore_label_single = _("Restore"); + + if (file_was_created (file)) + { + restore_label = Label::RemoveButton (); + restore_label_single= Label::RemoveButton (); + } + UI::ReplaceWidget (`id (`diff_content), `HBox (`HSpacing (0.5), `VBox ( content, `VSquash (`HBox ( `HStretch (), - // button label - type == `SINGLE ? `Empty () : `PushButton (`id (`restore_pre), _("R&estore From First")), - // button label - `PushButton (`id (`restore), type == `SINGLE ? _("Restore") : _("Res&tore From Second")) + type == `SINGLE ? `Empty () : `PushButton (`id (`restore_pre), restore_label), + `PushButton (`id (`restore), type == `SINGLE ? restore_label_single : _("Res&tore From Second")) )) ), `HSpacing (0.5)) ); - if (file_was_created (file)) - { - // file created after taking first snapshot cannot be restored from that snapshot - if (type == `SINGLE) - { - UI::ChangeWidget (`id (`restore), `Enabled, false); - } - else - { - UI::ChangeWidget (`id (`restore_pre), `Enabled, false); - } - } - else if (type != `SINGLE && file_was_removed (file)) + if (type != `SINGLE && file_was_removed (file)) { // file removed in 2nd snapshot cannot be restored from that snapshot UI::ChangeWidget (`id (`restore), `Enabled, false); @@ -629,13 +626,27 @@ else if (ret == `abort || ret == `cancel || ret == `back) { break; } + else if ((ret == `restore_pre || (ret == `restore && type == `SINGLE)) + && file_was_created (current_file)) + { + // yes/no question, %1 is file name, %2 is number + if (Popup::YesNo (sformat (_("Do you want to delete the file + +%1 + +from current system?"), Snapper::GetFileFullPath (current_file)))) + { + Snapper::RestoreFiles (ret == `restore_pre ? previous_num : snapshot_num, [current_file]); + } + continue; + } else if (ret == `restore_pre) { // yes/no question, %1 is file name, %2 is number - if (Popup::YesNo (sformat ("Do you want to copy the file + if (Popup::YesNo (sformat (_("Do you want to copy the file %1 -from snapshot '%2' to current system?", Snapper::GetFileFullPath (current_file), previous_num))) +from snapshot '%2' to current system?"), Snapper::GetFileFullPath (current_file), previous_num))) { Snapper::RestoreFiles (previous_num, [current_file]); } @@ -643,11 +654,11 @@ } else if (ret == `restore) { // yes/no question, %1 is file name, %2 is number - if (Popup::YesNo (sformat ("Do you want to copy the file + if (Popup::YesNo (sformat (_("Do you want to copy the file %1 -from snapshot '%2' to current system?", Snapper::GetFileFullPath (current_file), snapshot_num))) +from snapshot '%2' to current system?"), Snapper::GetFileFullPath (current_file), snapshot_num))) { Snapper::RestoreFiles (snapshot_num, [current_file]); } @@ -677,7 +688,12 @@ // popup headline if (Popup::AnyQuestionRichText (_("Restoring files"), // popup message, %1 is snapshot number, %2 list of files - sformat (_("These files will be copied from snapshot '%1' to current system: %2Are you sure?"), + sformat (_("These files will be restored from snapshot '%1': + +%2 + +Files existing in original snapshot will be copied to current system. +Files that did not exist in the snapshot will be deleted.Are you sure?"), previous_num, mergestring (to_restore, " ")), 60, 20, Label::YesButton (), Label::NoButton (), `focus_no)) { -- 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] r67204 - in /trunk/vm: package/yast2-vm.changes yast2-vm.spec.in
by coolo＠svn2.opensuse.org 16 Jan '12

16 Jan '12

Author: coolo Date: Mon Jan 16 15:57:37 2012 New Revision: 67204 URL: http://svn.opensuse.org/viewcvs/yast?rev=67204&view=rev Log: confirm license Modified: trunk/vm/package/yast2-vm.changes trunk/vm/yast2-vm.spec.in Modified: trunk/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/package/yast2-vm.changes?rev=… ============================================================================== --- trunk/vm/package/yast2-vm.changes (original) +++ trunk/vm/package/yast2-vm.changes Mon Jan 16 15:57:37 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 16 14:54:33 UTC 2012 - coolo(a)suse.com + +- confirm license + +------------------------------------------------------------------- Tue Jan 3 10:53:10 MST 2012 - carnold(a)novell.com - bnc#733715 - SLES11_SP2_LOC : EN: Typo in relocation-server.pot - Modified: trunk/vm/yast2-vm.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/yast2-vm.spec.in?rev=67204&r1… ============================================================================== --- trunk/vm/yast2-vm.spec.in (original) +++ trunk/vm/yast2-vm.spec.in Mon Jan 16 15:57:37 2012 @@ -4,6 +4,7 @@ @HEADER@ ExclusiveArch: %ix86 x86_64 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +License: GPL-2.0 Requires: yast2 >= 2.21.22 Summary: Configure Hypervisor and Tools for Xen and KVM -- 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] r67203 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: VERSION package/yast2-bootloader.changes src/routines/lilolike.ycp
by snwint＠svn2.opensuse.org 16 Jan '12

16 Jan '12

Author: snwint Date: Mon Jan 16 15:50:17 2012 New Revision: 67203 URL: http://svn.opensuse.org/viewcvs/yast?rev=67203&view=rev Log: - really update bootloader sections after device renaming (bnc #727310) - 2.17.85 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Mon Jan 16 15:50:17 2012 @@ -1 +1 @@ -2.17.84 +2.17.85 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Mon Jan 16 15:50:17 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 13 15:48:55 CET 2012 - snwint(a)suse.de + +- really update bootloader sections after device renaming (bnc #727310) +- 2.17.85 + +------------------------------------------------------------------- Tue Dec 6 15:49:53 CET 2011 - snwint(a)suse.de - use elilo to handle efi boot menu entries (bnc #717828) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/lilolike.ycp Mon Jan 16 15:50:17 2012 @@ -755,7 +755,7 @@ * Update in section old devices to new kernel format * @param section section to modify */ -void UpdateDeviceForSection(map<string,any> section){ +map<string,any> UpdateDeviceForSection(map<string,any> section) { if (section["type"]:"" == "image" || section["type"]:"" == "xen") { //check if we update correct image and if update is needed @@ -778,6 +778,8 @@ section["__modified"] = "1"; } } + + return section; } /** bnc#474039 upgrade from sles10sp2 to sles11 xen has incorrect default boot option @@ -790,9 +792,9 @@ */ global void UpdateSections () { - foreach (map<string,any> section, BootCommon::sections,{ + BootCommon::sections = maplist(map<string,any> section, BootCommon::sections, { //remap device names from hd* to sd* - UpdateDeviceForSection(section); + return UpdateDeviceForSection(section); }); } -- 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] r67202 - /trunk/ruby-bindings/package/yast2-ruby-bindings.changes
by jreidinger＠svn2.opensuse.org 16 Jan '12

16 Jan '12

Author: jreidinger Date: Mon Jan 16 15:50:08 2012 New Revision: 67202 URL: http://svn.opensuse.org/viewcvs/yast?rev=67202&view=rev Log: changes Modified: trunk/ruby-bindings/package/yast2-ruby-bindings.changes Modified: trunk/ruby-bindings/package/yast2-ruby-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/package/yast2-ruby… ============================================================================== --- trunk/ruby-bindings/package/yast2-ruby-bindings.changes (original) +++ trunk/ruby-bindings/package/yast2-ruby-bindings.changes Mon Jan 16 15:50:08 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 16 14:47:57 UTC 2012 - jreidinger(a)suse.com + +- allows loading modules which follows rails ruby convention + ( ActiveSupport module is in active_support.rb file ) + (bnc#705417) + +------------------------------------------------------------------- Wed Dec 7 10:06:27 UTC 2011 - coolo(a)suse.com - fix license to be in spdx.org format -- 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] r67201 - in /trunk/ruby-bindings: src/ruby/Y2CCRuby.cc src/ruby/Y2RubyComponent.cc src/ruby/Y2RubyComponent.h tests/ycp/camel_case.rb tests/ycp/ruby_from_ycp.ycp
by jreidinger＠svn2.opensuse.org 16 Jan '12

16 Jan '12

Author: jreidinger Date: Mon Jan 16 15:47:37 2012 New Revision: 67201 URL: http://svn.opensuse.org/viewcvs/yast?rev=67201&view=rev Log: fix loading of ruby module when module follows ruby convention ( so ActiveSupport module in in active_support.rb ) Added: trunk/ruby-bindings/tests/ycp/camel_case.rb Modified: trunk/ruby-bindings/src/ruby/Y2CCRuby.cc trunk/ruby-bindings/src/ruby/Y2RubyComponent.cc trunk/ruby-bindings/src/ruby/Y2RubyComponent.h trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Modified: trunk/ruby-bindings/src/ruby/Y2CCRuby.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2CCRuby.… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2CCRuby.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2CCRuby.cc Mon Jan 16 15:47:37 2012 @@ -46,6 +46,11 @@ // is there a ruby module? // must be the same in Y2CCRuby and Y2RubyComponent string module = YCPPathSearch::find (YCPPathSearch::Module, string (name) + ".rb"); + //lets try convert it with rails coding convention + if (module.empty()) + { + module = YCPPathSearch::find (YCPPathSearch::Module, Y2RubyComponent::CamelCase2DelimSepated(name) + ".rb"); + } if (!module.empty ()) { Modified: trunk/ruby-bindings/src/ruby/Y2RubyComponent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyCom… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyComponent.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyComponent.cc Mon Jan 16 15:47:37 2012 @@ -57,8 +57,12 @@ string module = YCPPathSearch::find (YCPPathSearch::Module, string (name) + ".rb"); if (module.empty ()) { - y2internal ("Couldn't find %s after Y2CCRuby pointed to us", name); - return NULL; + module = YCPPathSearch::find (YCPPathSearch::Module, Y2RubyComponent::CamelCase2DelimSepated(name) + ".rb"); + if (module.empty ()) + { + y2internal ("Couldn't find %s after Y2CCRuby pointed to us", name); + return NULL; + } } y2milestone("Found in '%s'", module.c_str()); module.erase (module.size () - 3 /* strlen (".pm") */); @@ -73,3 +77,22 @@ return ns; } + +const string Y2RubyComponent::CamelCase2DelimSepated( const char* name) +{ + string res(name); + size_t size = res.size(); + if (size==0) + return res; + res[0] = tolower(res[0]); //first character breaks rule with replace upper with _lower + for (size_t i = 1; i< res.size();i++) + { + if (isupper(res[i])) + { + string tmp = "_"; + tmp.push_back (tolower(res[i])); + res.replace(i,1,tmp); //replace upper by _lower + } + } + return res; +} Modified: trunk/ruby-bindings/src/ruby/Y2RubyComponent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyCom… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyComponent.h (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyComponent.h Mon Jan 16 15:47:37 2012 @@ -23,6 +23,7 @@ #define Y2RubyComponent_h #include "Y2.h" +#include <string.h> /** @@ -71,6 +72,13 @@ * free it. Thus, it's possible to share the instance. */ Y2Namespace *import (const char* name); + + /** + * Utility method to translate camelcase name of module to delimeter + * separated one. It is useful for loading modules which follows conventions + * so ActiveSupport namespace is from active_support.rb. + */ + static const std::string CamelCase2DelimSepated (const char* name); }; #endif // Y2RubyComponent_h Added: trunk/ruby-bindings/tests/ycp/camel_case.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/camel_ca… ============================================================================== --- trunk/ruby-bindings/tests/ycp/camel_case.rb (added) +++ trunk/ruby-bindings/tests/ycp/camel_case.rb Mon Jan 16 15:47:37 2012 @@ -0,0 +1,5 @@ +module CamelCase + def self.inc (n) + n+1 + end +end Modified: trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/ruby_fro… ============================================================================== --- trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp (original) +++ trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Mon Jan 16 15:47:37 2012 @@ -3,4 +3,7 @@ import "InRuby"; string result = tostring(InRuby::multiply_by_eight(10)); y2milestone("result: %1", result); + import "CamelCase"; + result = tostring(CamelCase::inc(10)); + y2milestone("result: %1", result); } -- 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] r67200 - in /trunk/network: ./ package/yast2-network.changes src/lan/address.ycp
by mvidner＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: mvidner Date: Fri Jan 13 16:05:54 2012 New Revision: 67200 URL: http://svn.opensuse.org/viewcvs/yast?rev=67200&view=rev Log: Fixed the bonding label again following info from mt (bnc#737333#c18). svn merge -c67199 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP2-Branch/network Modified: trunk/network/ (props changed) trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Jan 13 16:05:54 2012 @@ -3,7 +3,7 @@ - AY keep_install_network: merge dns and routing from linuxrc item by item, not just in bulk (bnc#712864). -- Clarified the label for BOOTPROTO=none: "No Setup (Bridge or +- Clarified the label for BOOTPROTO=none: "No Link and IP Setup ( Bonding Slaves)" (bnc#737333). - 2.22.1 Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=… ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Fri Jan 13 16:05:54 2012 @@ -323,7 +323,7 @@ else */ if (LanItems::type!="eth") UI::ReplaceWidget(`rp, `Left( - `RadioButton(`id(`none),`opt(`notify), _("No Setup (Bridge or Bonding Slaves)")))); + `RadioButton(`id(`none),`opt(`notify), _("No Link and IP Setup (Bonding Slaves)")))); switch(settings["BOOTPROTO"]:""){ case "static": UI::ChangeWidget(`id(`bootproto), `CurrentButton, `static); UI::ChangeWidget(`id(`ipaddr), `Value, settings["IPADDR"]:""); @@ -781,7 +781,7 @@ `ReplacePoint(`id(`rp), `Left( `HBox( - `RadioButton(`id(`none),`opt(`notify), _("No Setup (Bridge or Bonding Slaves)")), + `RadioButton(`id(`none),`opt(`notify), _("No Link and IP Setup (Bonding Slaves)")), `HSpacing(1), `CheckBox(`id(`ibft), `opt(`notify), _("Use iBFT values")) ) -- 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] r67199 - in /branches/SuSE-Code-11-SP2-Branch/network: package/yast2-network.changes src/lan/address.ycp
by mvidner＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: mvidner Date: Fri Jan 13 16:03:53 2012 New Revision: 67199 URL: http://svn.opensuse.org/viewcvs/yast?rev=67199&view=rev Log: Fixed the bonding label again following info from mt (bnc#737333#c18). Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Fri Jan 13 16:03:53 2012 @@ -3,7 +3,7 @@ - AY keep_install_network: merge dns and routing from linuxrc item by item, not just in bulk (bnc#712864). -- Clarified the label for BOOTPROTO=none: "No Setup (Bridge or +- Clarified the label for BOOTPROTO=none: "No Link and IP Setup ( Bonding Slaves)" (bnc#737333). - 2.17.166 Modified: branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/lan/address.ycp Fri Jan 13 16:03:53 2012 @@ -225,7 +225,7 @@ void initBootProto (string key) { if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty()); else if (LanItems::type!="eth") UI::ReplaceWidget(`rp, `Left( - `RadioButton(`id(`none),`opt(`notify), _("No Setup (Bridge or Bonding Slaves)")))); + `RadioButton(`id(`none),`opt(`notify), _("No Link and IP Setup (Bonding Slaves)")))); switch(settings["BOOTPROTO"]:""){ case "static": UI::ChangeWidget(`id(`bootproto), `CurrentButton, `static); UI::ChangeWidget(`id(`ipaddr), `Value, settings["IPADDR"]:""); @@ -680,7 +680,7 @@ `ReplacePoint(`id(`rp), `Left( `HBox( - `RadioButton(`id(`none),`opt(`notify), _("No Setup (Bridge or Bonding Slaves)")), + `RadioButton(`id(`none),`opt(`notify), _("No Link and IP Setup (Bonding Slaves)")), `HSpacing(1), `CheckBox(`id(`ibft), `opt(`notify), _("Use iBFT values")) ) -- 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] r67198 - /tags/branch-Linux-12_1-2_21_4/backup/
by locilka＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: locilka Date: Fri Jan 13 15:56:57 2012 New Revision: 67198 URL: http://svn.opensuse.org/viewcvs/yast?rev=67198&view=rev Log: Created tag branch-Linux-12_1-2_21_4 for backup Added: tags/branch-Linux-12_1-2_21_4/backup/ - copied from r67197, branches/SuSE-Linux-12_1-Branch/backup/ -- 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] r67197 - /tags/branch-Linux-12_1-2_21_4/
by locilka＠svn2.opensuse.org 13 Jan '12

13 Jan '12

Author: locilka Date: Fri Jan 13 15:56:54 2012 New Revision: 67197 URL: http://svn.opensuse.org/viewcvs/yast?rev=67197&view=rev Log: Created tag branch-Linux-12_1-2_21_4 Added: tags/branch-Linux-12_1-2_21_4/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0