May 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64006 - in /branches/SuSE-Code-11-SP1-Branch/testsuite: VERSION package/yast2-testsuite.changes skel/Makefile.testsuite.in skel/runtest.sh skel/testsuite.exp
by fehr＠svn2.opensuse.org 17 May '11

17 May '11

Author: fehr Date: Tue May 17 13:03:04 2011 New Revision: 64006 URL: http://svn.opensuse.org/viewcvs/yast?rev=64006&view=rev Log: - backport changes by Arvin needed for ycp testsuite in storage - don't override Makefile.am - extended runtest.sh - run all tests even if some fail - 2.17.0 Modified: branches/SuSE-Code-11-SP1-Branch/testsuite/VERSION branches/SuSE-Code-11-SP1-Branch/testsuite/package/yast2-testsuite.changes branches/SuSE-Code-11-SP1-Branch/testsuite/skel/Makefile.testsuite.in branches/SuSE-Code-11-SP1-Branch/testsuite/skel/runtest.sh branches/SuSE-Code-11-SP1-Branch/testsuite/skel/testsuite.exp Modified: branches/SuSE-Code-11-SP1-Branch/testsuite/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/tests… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/testsuite/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/testsuite/VERSION Tue May 17 13:03:04 2011 @@ -1 +1 @@ -2.16.2 +2.17.0 Modified: branches/SuSE-Code-11-SP1-Branch/testsuite/package/yast2-testsuite.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/tests… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/testsuite/package/yast2-testsuite.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/testsuite/package/yast2-testsuite.changes Tue May 17 13:03:04 2011 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue May 17 11:16:32 CEST 2011 - fehr(a)suse.de + +- backport changes by Arvin needed for ycp testsuite in storage +- don't override Makefile.am +- extended runtest.sh +- run all tests even if some fail +- 2.17.0 + +------------------------------------------------------------------- Tue Apr 8 13:09:41 CEST 2008 - mvidner(a)suse.cz - Enable make check before make install, by telling y2base to search Modified: branches/SuSE-Code-11-SP1-Branch/testsuite/skel/Makefile.testsuite.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/tests… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/testsuite/skel/Makefile.testsuite.in (original) +++ branches/SuSE-Code-11-SP1-Branch/testsuite/skel/Makefile.testsuite.in Tue May 17 13:03:04 2011 @@ -14,7 +14,7 @@ files_config=$(srcdir)/config/default.exp $(srcdir)/config/unix.exp $(srcdir)/config/unknown.exp files_run=$(srcdir)/run/runtest.sh files_test=$(srcdir)/$(RPMNAME).test/testsuite.exp -files_tmpl=$(srcdir)/Makefile.am $(srcdir)/.cvsignore +files_tmpl=$(srcdir)/.cvsignore files_all=$(files_config) $(files_test) $(files_tmpl) $(files_run) all: $(files_all) $(testsuite_dirs) @@ -28,11 +28,8 @@ # Overwrite the tested package's testsuite/Makefile.am only # if the template file is newer in content (which shouldn't # happen as it is only a proxy). Prevents automake mismatch errors. -$(srcdir)/Makefile.am: $(skeldir)/Makefile_am - cmp -s $< $@ || cp -f $< $@ - -$(srcdir)/.cvsignore: $(skeldir)/_cvsignore - cp -f $< $@ +#$(srcdir)/Makefile.am: $(skeldir)/Makefile_am +# cmp -s $< $@ || cp -f $< $@ $(srcdir)/run/runtest.sh: $(skeldir)/runtest.sh run cp -f $< $@ Modified: branches/SuSE-Code-11-SP1-Branch/testsuite/skel/runtest.sh URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/tests… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/testsuite/skel/runtest.sh (original) +++ branches/SuSE-Code-11-SP1-Branch/testsuite/skel/runtest.sh Tue May 17 13:03:04 2011 @@ -77,7 +77,7 @@ rm -f "$file" } -( $Y2BASE -l - -c "$logconf" $OPTIONS "$1" UI 2>&1 ) | parse >"$2" 2>"$3" +( Y2DIR=$Y2DIR:$Y2BASE_Y2DIR LD_LIBRARY_PATH=$Y2BASE_LD_LIBRARY_PATH $Y2BASE -l - -c "$logconf" $Y2BASEFLAGS $OPTIONS "$1" UI 2>&1 ) | parse >"$2" 2>"$3" retcode="$PIPESTATUS" if [ "$retcode" -gt 0 ]; then Modified: branches/SuSE-Code-11-SP1-Branch/testsuite/skel/testsuite.exp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/tests… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/testsuite/skel/testsuite.exp (original) +++ branches/SuSE-Code-11-SP1-Branch/testsuite/skel/testsuite.exp Tue May 17 13:03:04 2011 @@ -19,10 +19,6 @@ puts "\nChecking started\n" -foreach file $filenames { - if {[testsuite-run $file] < 0} { - return - } -} +foreach file $filenames { testsuite-run $file } puts "\nChecking finished\n" -- 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] r64005 - /tags/stable-2_21_3/ncurses/
by gs＠svn2.opensuse.org 17 May '11

17 May '11

Author: gs Date: Tue May 17 11:45:32 2011 New Revision: 64005 URL: http://svn.opensuse.org/viewcvs/yast?rev=64005&view=rev Log: Created tag stable-2_21_3 for ncurses Added: tags/stable-2_21_3/ncurses/ - copied from r64004, trunk/ncurses/ -- 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] r64004 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes
by gs＠svn2.opensuse.org 17 May '11

17 May '11

Author: gs Date: Tue May 17 11:41:49 2011 New Revision: 64004 URL: http://svn.opensuse.org/viewcvs/yast?rev=64004&view=rev Log: 2.21.3 Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=64004&r1=640… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Tue May 17 11:41:49 2011 @@ -1 +1 @@ -2.21.2 +2.21.3 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Tue May 17 11:41:49 2011 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Tue May 17 11:36:16 CEST 2011 - gs(a)suse.de + +- NCInputField: return event reason 'Activated' on key 'Return' +- V 2.21.3 + +------------------------------------------------------------------- +Mon May 9 09:59:12 UTC 2011 - cgiboudeaux(a)gmx.com + +- Add gcc46_build_fix.patch + +------------------------------------------------------------------- Tue Apr 26 11:05:41 CEST 2011 - gs(a)suse.de - NCTree: use default params for multi selection options -- 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] r64003 - /trunk/ncurses/src/NCInputField.cc
by gs＠svn2.opensuse.org 17 May '11

17 May '11

Author: gs Date: Tue May 17 11:36:00 2011 New Revision: 64003 URL: http://svn.opensuse.org/viewcvs/yast?rev=64003&view=rev Log: bugfix: return NCursesEvent::Activated on KEY_RETURN Modified: trunk/ncurses/src/NCInputField.cc Modified: trunk/ncurses/src/NCInputField.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCInputField.cc?rev=… ============================================================================== --- trunk/ncurses/src/NCInputField.cc (original) +++ trunk/ncurses/src/NCInputField.cc Tue May 17 11:36:00 2011 @@ -457,7 +457,8 @@ break; case KEY_RETURN: - + update = false; + if ( notify() || returnOnReturn_b ) ret = NCursesEvent::Activated; -- 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] r64002 - /trunk/ncurses/src/NCTable.cc
by gs＠svn2.opensuse.org 17 May '11

17 May '11

Author: gs Date: Tue May 17 11:25:16 2011 New Revision: 64002 URL: http://svn.opensuse.org/viewcvs/yast?rev=64002&view=rev Log: gcc46_build_fix (provided by cgiboudeaux) Diese und die folgenden Zeilen werden ignoriert -- M NCTable.cc Modified: trunk/ncurses/src/NCTable.cc Modified: trunk/ncurses/src/NCTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTable.cc?rev=64002… ============================================================================== --- trunk/ncurses/src/NCTable.cc (original) +++ trunk/ncurses/src/NCTable.cc Tue May 17 11:25:16 2011 @@ -356,7 +356,7 @@ yuiMilestone() << item->label() << " is selected: " << (selected?"yes":"no") << endl; - NCTableTag *tag = static_cast<const NCTableTag *>( line->GetCol( 0 ) ); + NCTableTag *tag = static_cast<NCTableTag *>( line->GetCol( 0 ) ); tag->SetSelected( selected ); } -- 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] r64001 - in /trunk/iscsi-server: VERSION package/yast2-iscsi-server.changes src/widgets.ycp
by fehr＠svn2.opensuse.org 16 May '11

16 May '11

Author: fehr Date: Mon May 16 12:50:44 2011 New Revision: 64001 URL: http://svn.opensuse.org/viewcvs/yast?rev=64001&view=rev Log: - allow only integer values in lun input field (bnc#693683) - 2.21.1 Modified: trunk/iscsi-server/VERSION trunk/iscsi-server/package/yast2-iscsi-server.changes trunk/iscsi-server/src/widgets.ycp Modified: trunk/iscsi-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/VERSION?rev=64001&r… ============================================================================== --- trunk/iscsi-server/VERSION (original) +++ trunk/iscsi-server/VERSION Mon May 16 12:50:44 2011 @@ -1 +1 @@ -2.21.0 +2.21.1 Modified: trunk/iscsi-server/package/yast2-iscsi-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-server/package/yast2-iscsi-server.changes (original) +++ trunk/iscsi-server/package/yast2-iscsi-server.changes Mon May 16 12:50:44 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 16 11:29:53 CEST 2011 - fehr(a)suse.de + +- allow only integer values in lun input field (bnc#693683) +- 2.21.1 + +------------------------------------------------------------------- Fri Apr 22 14:03:44 CEST 2011 - mvidner(a)suse.cz - Replaced Perl 'switch' with 'if' to silence a warning (bnc#676679). Modified: trunk/iscsi-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/src/widgets.ycp?rev… ============================================================================== --- trunk/iscsi-server/src/widgets.ycp (original) +++ trunk/iscsi-server/src/widgets.ycp Mon May 16 12:50:44 2011 @@ -68,6 +68,7 @@ `Left( `HBox( `PushButton(`id(`ok), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() ))) ); UI::OpenDialog(lun_dialog); + UI::ChangeWidget(`id(`lun), `ValidChars, "0123456789" ); symbol ret = `nil; while(ret != `ok && ret !=`cancel){ boolean enable=false; -- 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] r64000 - /tags/branch-Code-11-SP1-2_17_9/iscsi-server/
by fehr＠svn2.opensuse.org 16 May '11

16 May '11

Author: fehr Date: Mon May 16 12:46:50 2011 New Revision: 64000 URL: http://svn.opensuse.org/viewcvs/yast?rev=64000&view=rev Log: Created tag branch-Code-11-SP1-2_17_9 for iscsi-server Added: tags/branch-Code-11-SP1-2_17_9/iscsi-server/ (props changed) - copied from r63999, branches/SuSE-Code-11-SP1-Branch/iscsi-server/ -- 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] r63999 - in /branches/SuSE-Code-11-SP1-Branch/iscsi-server: VERSION package/yast2-iscsi-server.changes src/widgets.ycp
by fehr＠svn2.opensuse.org 16 May '11

16 May '11

Author: fehr Date: Mon May 16 12:46:42 2011 New Revision: 63999 URL: http://svn.opensuse.org/viewcvs/yast?rev=63999&view=rev Log: - allow only integer values in lun input field (bnc#693683) - 2.17.9 Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/VERSION branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/VERSION Mon May 16 12:46:42 2011 @@ -1 +1 @@ -2.17.8 +2.17.9 Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes Mon May 16 12:46:42 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 16 11:29:53 CEST 2011 - fehr(a)suse.de + +- allow only integer values in lun input field (bnc#693683) +- 2.17.9 + +------------------------------------------------------------------- Tue Nov 3 12:52:14 CET 2009 - mzugec(a)suse.cz - export credentials for target (fate#301932) Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp Mon May 16 12:46:42 2011 @@ -68,6 +68,7 @@ `Left( `HBox( `PushButton(`id(`ok), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() ))) ); UI::OpenDialog(lun_dialog); + UI::ChangeWidget(`id(`lun), `ValidChars, "0123456789" ); symbol ret = `nil; while(ret != `ok && ret !=`cancel){ boolean enable=false; -- 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] r63998 - /trunk/autoinstallation/src/modules/AutoinstLVM.ycp
by ug＠svn2.opensuse.org 13 May '11

13 May '11

Author: ug Date: Fri May 13 14:27:59 2011 New Revision: 63998 URL: http://svn.opensuse.org/viewcvs/yast?rev=63998&view=rev Log: cleanup Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstLVM.ycp Fri May 13 14:27:59 2011 @@ -94,7 +94,7 @@ string lvm_group = p["lvm_group"]:"x"; // we know the LV now. So remove it from the keep-list for now keepLVM[lvm_group] = filter (string v, keepLVM[lvm_group]:[], { return ( v != vg_p["lv_name"]:"" ); }); - if( vg_p["create"]:true == false && !contains(keepLVM[lvm_group]:[], vg_p["lv_name"]:"") ) { + if( vg_p["create"]:true == false ) { keepLVM[lvm_group] = add( keepLVM[lvm_group]:[], vg_p["lv_name"]:"" ); } }); -- 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] r63997 - /branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstLVM.ycp
by ug＠svn2.opensuse.org 13 May '11

13 May '11

Author: ug Date: Fri May 13 14:27:32 2011 New Revision: 63997 URL: http://svn.opensuse.org/viewcvs/yast?rev=63997&view=rev Log: cleanup Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstLVM.ycp Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstLVM.ycp Fri May 13 14:27:32 2011 @@ -100,7 +100,7 @@ string lvm_group = p["lvm_group"]:"x"; // we know the LV now. So remove it from the keep-list for now keepLVM[lvm_group] = filter (string v, keepLVM[lvm_group]:[], { return ( v != vg_p["lv_name"]:"" ); }); - if( vg_p["create"]:true == false && !contains(keepLVM[lvm_group]:[], vg_p["lv_name"]:"") ) { + if( vg_p["create"]:true == false ) { keepLVM[lvm_group] = add( keepLVM[lvm_group]:[], vg_p["lv_name"]:"" ); } }); -- 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] r63996 - in /branches/SuSE-Code-11-SP2-Branch/autoinstallation: package/autoyast2.changes src/modules/AutoinstLVM.ycp
by ug＠svn2.opensuse.org 13 May '11

13 May '11

Author: ug Date: Fri May 13 14:24:30 2011 New Revision: 63996 URL: http://svn.opensuse.org/viewcvs/yast?rev=63996&view=rev Log: keep_unknown_lv added (fate#308893) Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstLVM.ycp Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes Fri May 13 14:24:30 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 13 14:24:10 CEST 2011 - ug(a)suse.de + +- keep_unknown_lv added (fate#308893) + +------------------------------------------------------------------- Tue Apr 26 10:14:58 CEST 2011 - ug(a)suse.de - try to mount DVD/CD again if first mount fails Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstLVM.ycp Fri May 13 14:24:30 2011 @@ -80,17 +80,29 @@ return (substring(d, 5) ); }); + /* we say keep all LVs where the keep_unknown_lv is set */ + foreach ( string k, map v, ExistingLVM, ``{ + string vgname = v["name"]:""; + foreach( map p, v["partitions"]:[], ``{ + if( lvm["/dev/"+vgname,"keep_unknown_lv"]:false == true ) + keepLVM[vgname] = add( keepLVM[vgname]:[], p["lv_name"]:"" ); + }); + }); + /* look for VGs to reuse */ foreach ( string k, map v, AutoinstStorage::AutoTargetMap, ``{ foreach ( map p, v["partitions"]:[], ``{ if( haskey( p, "lvm_group" ) && p["create"]:true == false && p["format"]:true == false ) { - keepLVM[p["lvm_group"]:"x"] = []; if( !contains( ExistingVGs, p["lvm_group"]:"x" ) ) Report::Error( sformat( _("Cannot reuse volume group %1. The volume group does not exist."), p["lvm_group"]:"x" ) ); map atm = AutoinstStorage::AutoTargetMap; foreach ( map vg_p, atm["/dev/"+p["lvm_group"]:"x","partitions"]:[], ``{ - if( vg_p["create"]:true == false ) - keepLVM[p["lvm_group"]:"x"] = add( keepLVM[p["lvm_group"]:"x"]:[], vg_p["lv_name"]:"" ); + string lvm_group = p["lvm_group"]:"x"; + // we know the LV now. So remove it from the keep-list for now + keepLVM[lvm_group] = filter (string v, keepLVM[lvm_group]:[], { return ( v != vg_p["lv_name"]:"" ); }); + if( vg_p["create"]:true == false && !contains(keepLVM[lvm_group]:[], vg_p["lv_name"]:"") ) { + keepLVM[lvm_group] = add( keepLVM[lvm_group]:[], vg_p["lv_name"]:"" ); + } }); } }); -- 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] r63995 - in /trunk/autoinstallation: doc/PartitioningSection.xml doc/autoyast.xml package/autoyast2.changes src/modules/AutoinstLVM.ycp
by ug＠svn2.opensuse.org 13 May '11

13 May '11

Author: ug Date: Fri May 13 14:23:31 2011 New Revision: 63995 URL: http://svn.opensuse.org/viewcvs/yast?rev=63995&view=rev Log: keep_unknown_lv added (fate#308893) Modified: trunk/autoinstallation/doc/PartitioningSection.xml trunk/autoinstallation/doc/autoyast.xml trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstLVM.ycp Modified: trunk/autoinstallation/doc/PartitioningSection.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/Partitionin… ============================================================================== --- trunk/autoinstallation/doc/PartitioningSection.xml (original) +++ trunk/autoinstallation/doc/PartitioningSection.xml Fri May 13 14:23:31 2011 @@ -146,6 +146,13 @@ </entry> <entry>optional and available since openSUSE 12.1 and SLES11 SP2. Default is to let yast decide what makes sense (msdos in most cases)</entry> </row> + <row> + <entry>keep_unknown_lv</entry> + <entry>This value only makes sense for type=CT_LVM drives. If you are reusing a LVG and you set this to true, all existing LVs in that VG won't be touched unless they are specified in the <partitioning> section. So you can keep existing LVs without need to specify them. +<para><screen><keep_unknown_lv config:type="boolean">false</keep_unknown_lv></screen></para> +</entry> + <entry>optional and available since openSUSE 12.1 and SLES11 SP2. The default is false</entry> + </row> </tbody> </tgroup> </table> @@ -450,7 +457,7 @@ <entry>parity_algorithm</entry> <entry> <para> - possible values are: left_asymmetric, left_symmetric, right_asymmetric, right_symmetric + possible values are: left_asymmetric, left_symmetric, right_asymmetric, right_symmetric and since SLES11 SP2 and openSUSE 12.1 you can use parity_first, parity_last, left_asymmetric_6, left_symmetric_6, right_asymmetric_6, right_symmetric_6, parity_first_6, n2, o2, f2, n3, o3, f3 for RAID6 and RAID10 </para> <para><screen><parity_algorithm>left_asymmetric</parity_algorithm></screen></para> </entry> Modified: trunk/autoinstallation/doc/autoyast.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/autoyast.xm… ============================================================================== --- trunk/autoinstallation/doc/autoyast.xml (original) +++ trunk/autoinstallation/doc/autoyast.xml Fri May 13 14:23:31 2011 @@ -59,7 +59,7 @@ <firstname>Uwe</firstname> <surname>Gansert</surname> <affiliation> - <jobtitle>Server Technologies</jobtitle> + <jobtitle>Concepts, Development and Documentation</jobtitle> <orgname></orgname> </affiliation> </author> Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri May 13 14:23:31 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 13 14:22:32 CEST 2011 - ug(a)suse.de + +- keep_unknown_lv added (fate#308893) + +------------------------------------------------------------------- Tue Apr 26 17:30:58 CEST 2011 - ug(a)suse.de - added documention for disklabel (bnc#631176) Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstLVM.ycp Fri May 13 14:23:31 2011 @@ -74,17 +74,29 @@ return (substring(d, 5) ); }); + /* we say keep all LVs where the keep_unknown_lv is set */ + foreach ( string k, map v, ExistingLVM, ``{ + string vgname = v["name"]:""; + foreach( map p, v["partitions"]:[], ``{ + if( lvm["/dev/"+vgname,"keep_unknown_lv"]:false == true ) + keepLVM[vgname] = add( keepLVM[vgname]:[], p["lv_name"]:"" ); + }); + }); + /* look for VGs to reuse */ foreach ( string k, map v, AutoinstStorage::AutoTargetMap, ``{ foreach ( map p, v["partitions"]:[], ``{ if( haskey( p, "lvm_group" ) && p["create"]:true == false && p["format"]:true == false ) { - keepLVM[p["lvm_group"]:"x"] = []; if( !contains( ExistingVGs, p["lvm_group"]:"x" ) ) Report::Error( sformat( _("Cannot reuse volume group %1. The volume group does not exist."), p["lvm_group"]:"x" ) ); map atm = AutoinstStorage::AutoTargetMap; foreach ( map vg_p, atm["/dev/"+p["lvm_group"]:"x","partitions"]:[], ``{ - if( vg_p["create"]:true == false ) - keepLVM[p["lvm_group"]:"x"] = add( keepLVM[p["lvm_group"]:"x"]:[], vg_p["lv_name"]:"" ); + string lvm_group = p["lvm_group"]:"x"; + // we know the LV now. So remove it from the keep-list for now + keepLVM[lvm_group] = filter (string v, keepLVM[lvm_group]:[], { return ( v != vg_p["lv_name"]:"" ); }); + if( vg_p["create"]:true == false && !contains(keepLVM[lvm_group]:[], vg_p["lv_name"]:"") ) { + keepLVM[lvm_group] = add( keepLVM[lvm_group]:[], vg_p["lv_name"]:"" ); + } }); } }); -- 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] r63994 - /branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes
by lslezak＠svn2.opensuse.org 13 May '11

13 May '11

Author: lslezak Date: Fri May 13 13:31:54 2011 New Revision: 63994 URL: http://svn.opensuse.org/viewcvs/yast?rev=63994&view=rev Log: fixed .changes - removed dates to fix the chronology Modified: branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes Modified: branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/sound… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes Fri May 13 13:31:54 2011 @@ -10,16 +10,8 @@ value for teh volume level so the value displayed in the UI and the actual volume setting were not in sync when moving the sliders (bnc#664094) - -------------------------------------------------------------------- -Thu Oct 14 12:32:32 UTC 2010 - lslezak(a)suse.cz - - make the joystick dialog label better translatable in RTL languages (bnc#583209) - -------------------------------------------------------------------- -Tue Oct 12 10:53:46 UTC 2010 - lslezak(a)suse.cz - - added Creative X-Fi to sound card DB (bnc#613746) ------------------------------------------------------------------- -- 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] r63993 - /trunk/s390/yast2-s390.spec.in
by aschnell＠svn2.opensuse.org 13 May '11

13 May '11

Author: aschnell Date: Fri May 13 11:41:10 2011 New Revision: 63993 URL: http://svn.opensuse.org/viewcvs/yast?rev=63993&view=rev Log: - cleanup Modified: trunk/s390/yast2-s390.spec.in Modified: trunk/s390/yast2-s390.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/yast2-s390.spec.in?rev=6399… ============================================================================== --- trunk/s390/yast2-s390.spec.in (original) +++ trunk/s390/yast2-s390.spec.in Fri May 13 11:41:10 2011 @@ -1,9 +1,10 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL v2 or later -BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite +Group: System/YaST +License: GPL v2 or later +BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files +BuildRequires: yast2 yast2-devtools yast2-testsuite ExclusiveArch: s390 s390x Requires: yast2 s390-tools -- 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] r63992 - in /trunk/s390: ./ agents/ src/config/ src/dump/ src/xpram/
by aschnell＠svn2.opensuse.org 13 May '11

13 May '11

Author: aschnell Date: Fri May 13 10:39:01 2011 New Revision: 63992 URL: http://svn.opensuse.org/viewcvs/yast?rev=63992&view=rev Log: - updated svn ignore data Modified: trunk/s390/ (props changed) trunk/s390/agents/ (props changed) trunk/s390/src/config/ (props changed) trunk/s390/src/dump/ (props changed) trunk/s390/src/xpram/ (props changed) -- 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] r63991 - in /branches/SuSE-Code-11-SP2-Branch/sound: data/sndcards.ycp package/yast2-sound.changes
by lslezak＠svn2.opensuse.org 13 May '11

13 May '11

Author: lslezak Date: Fri May 13 10:26:04 2011 New Revision: 63991 URL: http://svn.opensuse.org/viewcvs/yast?rev=63991&view=rev Log: added a missing commit from SP1 branch Modified: branches/SuSE-Code-11-SP2-Branch/sound/data/sndcards.ycp branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes Modified: branches/SuSE-Code-11-SP2-Branch/sound/data/sndcards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/sound… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/sound/data/sndcards.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/sound/data/sndcards.ycp Fri May 13 10:26:04 2011 @@ -1,4 +1,4 @@ -/* this file is automatically generated for kernel version 2.6.27.4-2-pae*/ +/* this file is automatically generated for kernel version 2.6.32.24-0.2-default*/ { textdomain "sound_db"; @@ -665,6 +665,7 @@ 17264 : 73, 17272 : 74, 17275 : 78, + 17282 : 73, 17283 : 78, 31001 : 78, 31035 : 78, @@ -727,6 +728,7 @@ 4277 : $[ 36912 : 67, 36944 : 67, + 36950 : 79, 36973 : 42, 38486 : 79 ], @@ -762,6 +764,7 @@ 1099 : 78, 1372 : 78, 1373 : 78, + 1424 : 78, 1908 : 78, 1909 : 78, 1910 : 78, @@ -772,10 +775,13 @@ 2753 : 78, 2754 : 78, 2755 : 78, - 3028 : 78, - 3029 : 78, - 3030 : 78, - 3031 : 78 + 3042 : 78, + 3043 : 78, + 3044 : 78, + 3476 : 78, + 3477 : 78, + 3478 : 78, + 3479 : 78 ], 4334 : $[ 16320 : 54, @@ -789,11 +795,10 @@ 4354 : $[ 2 : 22, 4 : 22, - 5 : 83, 6 : 76, 7 : 77, 8 : 22, - 11: 83, + 9 : 78, 35128 : 24 ], 4358 : $[ @@ -916,6 +921,7 @@ 2049 : 48 ], 32902 : $[ + 7200 : 78, 9237 : 38, 9238 : 39, 9253 : 38, @@ -944,6 +950,7 @@ 14910 : 78, 14958 : 78, 15190 : 78, + 15191 : 78, 29077 : 38, 29078 : 39, 33051 : 78 @@ -957,7 +964,7 @@ 39064 : 53 ], 65535 : $[ - 65535 : 16 + 65535 : 45 ], 197633 : $[ 196624 : 100, Modified: branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/sound… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes Fri May 13 10:26:04 2011 @@ -23,6 +23,12 @@ - added Creative X-Fi to sound card DB (bnc#613746) ------------------------------------------------------------------- +Thu Dec 30 12:29:46 UTC 2010 - lslezak(a)suse.cz + +- updated sound card database (bnc#655331) +- 2.17.16.1 + +------------------------------------------------------------------- Wed Apr 1 14:19:56 CEST 2009 - lslezak(a)suse.cz - make channel names unique - add channel index to channel name -- 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] r63990 - /tags/branch-Code-11-SP2-2_17_39/product-creator/
by jsuchome＠svn2.opensuse.org 13 May '11

13 May '11

Author: jsuchome Date: Fri May 13 10:02:12 2011 New Revision: 63990 URL: http://svn.opensuse.org/viewcvs/yast?rev=63990&view=rev Log: Created tag branch-Code-11-SP2-2_17_39 for product-creator Added: tags/branch-Code-11-SP2-2_17_39/product-creator/ (props changed) - copied from r63989, branches/SuSE-Code-11-SP2-Branch/product-creator/ -- 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] r63989 - /tags/branch-Code-11-SP2-2_17_39/
by jsuchome＠svn2.opensuse.org 13 May '11

13 May '11

Author: jsuchome Date: Fri May 13 10:02:08 2011 New Revision: 63989 URL: http://svn.opensuse.org/viewcvs/yast?rev=63989&view=rev Log: Created tag branch-Code-11-SP2-2_17_39 Added: tags/branch-Code-11-SP2-2_17_39/ -- 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] r63988 - in /branches/SuSE-Code-11-SP2-Branch/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi_dialogs.ycp yast2-product-creator.spec.in
by jsuchome＠svn2.opensuse.org 13 May '11

13 May '11

Author: jsuchome Date: Fri May 13 10:02:04 2011 New Revision: 63988 URL: http://svn.opensuse.org/viewcvs/yast?rev=63988&view=rev Log: - better UI for locale related settings (fate#311734) - 2.17.39 Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp branches/SuSE-Code-11-SP2-Branch/product-creator/yast2-product-creator.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION Fri May 13 10:02:04 2011 @@ -1 +1 @@ -2.17.38.2 +2.17.39 Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes Fri May 13 10:02:04 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 26 10:50:33 CEST 2011 - jsuchome(a)suse.cz + +- better UI for locale related settings (fate#311734) +- 2.17.39 + +------------------------------------------------------------------- Fri Mar 11 15:09:41 CET 2011 - jsuchome(a)suse.cz - allow live iso creation only for x86/x86_64 (bnc#678145) Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp Fri May 13 10:02:04 2011 @@ -79,6 +79,12 @@ string stderr_file = "image_creator.stderr"; string logs_directory = "/tmp"; + // all available locales + global list<string> all_locales = []; + + // all available time zones + global list<string> all_timezones = []; + /** * crypt given user password with current encryption algorithm */ Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp Fri May 13 10:02:04 2011 @@ -14,6 +14,7 @@ import "CWMTab"; import "Directory"; import "FileUtils"; + import "Keyboard"; import "Kiwi"; import "Label"; import "Message"; @@ -516,6 +517,73 @@ } /** + * initialize the list value of "locale" combo box + */ + define void InitLocaleCombo (string id) { + + string lang = KiwiConfig["preferences",0,id,0,content_key]:""; + list items = []; + + if (Kiwi::all_locales == []) + { + map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/locale -a"); + Kiwi::all_locales = filter (string s, splitstring (out["stdout"]:"", "\n"), { + return s != ""; + }); + } + foreach (string line, Kiwi::all_locales, { + string code = splitstring (line, ".@")[0]:line; + items = add (items, `item (`id (code), code, lang == code)); + }); + + UI::ChangeWidget (`id (id), `Items, items); + } + + /** + * initialize the list value of "keytable" combo box + */ + define void InitKeytableCombo (string id) { + + string kb = KiwiConfig["preferences",0,id,0,content_key]:""; + + list items = []; + boolean kb_present = false; + + foreach (string name, string yast, Keyboard::keymap2yast (), { + items = add (items, `item (`id (name), name, kb == name)); + if (kb == name) kb_present = true; + }); + if (!kb_present) + { + items = add (items, `item (`id (kb), kb, true)); + } + UI::ChangeWidget (`id (id), `Items, items); + } + + /** + * initialize the list value of "timezone" combo box + */ + define void InitTimezoneCombo (string id) { + + string tz = KiwiConfig["preferences",0,id,0,content_key]:""; + + if (Kiwi::all_timezones == []) + { + map out = (map) SCR::Execute (.target.bash_output, + "grep -v '#' /usr/share/zoneinfo/zone.tab | cut -f 3 | sort", $["LANG":"C"]); + Kiwi::all_timezones = filter (string t, splitstring (out["stdout"]:"", "\n"), { + return t != ""; + }); + } + + list items = maplist (string zone, Kiwi::all_timezones, { + return `item (`id (zone), zone, tz == zone); + }); + + UI::ChangeWidget (`id (id), `Items, items); + } + + /** * initialize the string value of "preferences" related widget */ define void InitPreferences (string id) { @@ -1945,10 +2013,12 @@ "no_help" : true, ], "locale" : $[ - "widget" : `textentry, + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + "items" : [], // textentry label "label" : _("&Locale"), - "init" : InitPreferences, + "init" : InitLocaleCombo, "store" : StorePreferences, "handle" : HandlePreferences, // help text for locale (heading) @@ -1957,20 +2027,23 @@ _("The value of Locale (e.g. <tt>en_US</tt>) defines the contents of the RC_LANG variable in <t>/etc/sysconfig/language</tt>."), ], "keytable" : $[ - "widget" : `textentry, + "widget" : `combobox, + "opt" : [ `hstretch, `notify, `editable ], // textentry label "label" : _("&Keyboard layout"), - "init" : InitPreferences, + "init" : InitKeytableCombo, "store" : StorePreferences, "handle" : HandlePreferences, // help text for keytable "help" : _("Keyboard layout specifies the name of the console keymap to use. The value corresponds to a map file in <tt>/usr/share/kbd/keymaps</tt>."), ], "timezone" : $[ - "widget" : `textentry, + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + "items" : [], // textentry label "label" : _("&Time zone"), - "init" : InitPreferences, + "init" : InitTimezoneCombo, "store" : StorePreferences, "handle" : HandlePreferences, // help text for timezone Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/yast2-product-creator.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/yast2-product-creator.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/yast2-product-creator.spec.in Fri May 13 10:02:04 2011 @@ -5,7 +5,7 @@ PreReq: %fillup_prereq -Requires: autoyast2-installation yast2-security +Requires: autoyast2-installation yast2-security yast2-country # ag_pattern handling gzipped files Requires: yast2-add-on-creator >= 2.17.1 -- 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] r63987 - /tags/branch-Code-11-SP2-2_17_17/s390/
by aschnell＠svn2.opensuse.org 13 May '11

13 May '11

Author: aschnell Date: Fri May 13 10:01:48 2011 New Revision: 63987 URL: http://svn.opensuse.org/viewcvs/yast?rev=63987&view=rev Log: Created tag branch-Code-11-SP2-2_17_17 for s390 Added: tags/branch-Code-11-SP2-2_17_17/s390/ (props changed) - copied from r63986, branches/SuSE-Code-11-SP2-Branch/s390/ -- 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] r63986 - /tags/stable-2_21_2/product-creator/
by jsuchome＠svn2.opensuse.org 13 May '11

13 May '11

Author: jsuchome Date: Fri May 13 10:01:29 2011 New Revision: 63986 URL: http://svn.opensuse.org/viewcvs/yast?rev=63986&view=rev Log: Created tag stable-2_21_2 for product-creator Added: tags/stable-2_21_2/product-creator/ - copied from r63985, trunk/product-creator/ -- 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] r63985 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi_dialogs.ycp yast2-product-creator.spec.in
by jsuchome＠svn2.opensuse.org 13 May '11

13 May '11

Author: jsuchome Date: Fri May 13 10:00:55 2011 New Revision: 63985 URL: http://svn.opensuse.org/viewcvs/yast?rev=63985&view=rev Log: - better UI for locale related settings (fate#311734) - 2.21.2 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/kiwi_dialogs.ycp trunk/product-creator/yast2-product-creator.spec.in Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=6398… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Fri May 13 10:00:55 2011 @@ -1 +1 @@ -2.21.1 +2.21.2 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri May 13 10:00:55 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 13 09:59:46 CEST 2011 - jsuchome(a)suse.cz + +- better UI for locale related settings (fate#311734) +- 2.21.2 + +------------------------------------------------------------------- Fri Mar 11 15:07:59 CET 2011 - jsuchome(a)suse.cz - allow live iso creation only for x86/x86_64 (bnc#678145) Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev… ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Fri May 13 10:00:55 2011 @@ -79,6 +79,12 @@ string stderr_file = "image_creator.stderr"; string logs_directory = "/tmp"; + // all available locales + global list<string> all_locales = []; + + // all available time zones + global list<string> all_timezones = []; + /** * crypt given user password with current encryption algorithm */ Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Fri May 13 10:00:55 2011 @@ -14,6 +14,7 @@ import "CWMTab"; import "Directory"; import "FileUtils"; + import "Keyboard"; import "Kiwi"; import "Label"; import "Message"; @@ -516,6 +517,73 @@ } /** + * initialize the list value of "locale" combo box + */ + define void InitLocaleCombo (string id) { + + string lang = KiwiConfig["preferences",0,id,0,content_key]:""; + list items = []; + + if (Kiwi::all_locales == []) + { + map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/locale -a"); + Kiwi::all_locales = filter (string s, splitstring (out["stdout"]:"", "\n"), { + return s != ""; + }); + } + foreach (string line, Kiwi::all_locales, { + string code = splitstring (line, ".@")[0]:line; + items = add (items, `item (`id (code), code, lang == code)); + }); + + UI::ChangeWidget (`id (id), `Items, items); + } + + /** + * initialize the list value of "keytable" combo box + */ + define void InitKeytableCombo (string id) { + + string kb = KiwiConfig["preferences",0,id,0,content_key]:""; + + list items = []; + boolean kb_present = false; + + foreach (string name, string yast, Keyboard::keymap2yast (), { + items = add (items, `item (`id (name), name, kb == name)); + if (kb == name) kb_present = true; + }); + if (!kb_present) + { + items = add (items, `item (`id (kb), kb, true)); + } + UI::ChangeWidget (`id (id), `Items, items); + } + + /** + * initialize the list value of "timezone" combo box + */ + define void InitTimezoneCombo (string id) { + + string tz = KiwiConfig["preferences",0,id,0,content_key]:""; + + if (Kiwi::all_timezones == []) + { + map out = (map) SCR::Execute (.target.bash_output, + "grep -v '#' /usr/share/zoneinfo/zone.tab | cut -f 3 | sort", $["LANG":"C"]); + Kiwi::all_timezones = filter (string t, splitstring (out["stdout"]:"", "\n"), { + return t != ""; + }); + } + + list items = maplist (string zone, Kiwi::all_timezones, { + return `item (`id (zone), zone, tz == zone); + }); + + UI::ChangeWidget (`id (id), `Items, items); + } + + /** * initialize the string value of "preferences" related widget */ define void InitPreferences (string id) { @@ -1942,10 +2010,12 @@ "no_help" : true, ], "locale" : $[ - "widget" : `textentry, + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + "items" : [], // textentry label "label" : _("&Locale"), - "init" : InitPreferences, + "init" : InitLocaleCombo, "store" : StorePreferences, "handle" : HandlePreferences, // help text for locale (heading) @@ -1954,20 +2024,23 @@ _("The value of Locale (e.g. <tt>en_US</tt>) defines the contents of the RC_LANG variable in <t>/etc/sysconfig/language</tt>."), ], "keytable" : $[ - "widget" : `textentry, + "widget" : `combobox, + "opt" : [ `hstretch, `notify, `editable ], // textentry label "label" : _("&Keyboard layout"), - "init" : InitPreferences, + "init" : InitKeytableCombo, "store" : StorePreferences, "handle" : HandlePreferences, // help text for keytable "help" : _("Keyboard layout specifies the name of the console keymap to use. The value corresponds to a map file in <tt>/usr/share/kbd/keymaps</tt>."), ], "timezone" : $[ - "widget" : `textentry, + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + "items" : [], // textentry label "label" : _("&Time zone"), - "init" : InitPreferences, + "init" : InitTimezoneCombo, "store" : StorePreferences, "handle" : HandlePreferences, // help text for timezone Modified: trunk/product-creator/yast2-product-creator.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/yast2-product-cr… ============================================================================== --- trunk/product-creator/yast2-product-creator.spec.in (original) +++ trunk/product-creator/yast2-product-creator.spec.in Fri May 13 10:00:55 2011 @@ -7,7 +7,7 @@ PreReq: %fillup_prereq -Requires: autoyast2-installation yast2-security +Requires: autoyast2-installation yast2-security yast2-country # ag_pattern handling gzipped files Requires: yast2-add-on-creator >= 2.17.1 -- 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] r63984 - in /trunk/s390: VERSION package/yast2-s390.changes src/clients/zfcp_proposal.ycp src/modules/ZFCPController.ycp src/zfcp/dialogs.ycp src/zfcp/helps.ycp
by aschnell＠svn2.opensuse.org 13 May '11

13 May '11

Author: aschnell Date: Fri May 13 09:58:22 2011 New Revision: 63984 URL: http://svn.opensuse.org/viewcvs/yast?rev=63984&view=rev Log: - allow to configure zFCP tapes (fate #311718) Modified: trunk/s390/VERSION trunk/s390/package/yast2-s390.changes trunk/s390/src/clients/zfcp_proposal.ycp trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp trunk/s390/src/zfcp/helps.ycp Modified: trunk/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/VERSION?rev=63984&r1=63983&… ============================================================================== --- trunk/s390/VERSION (original) +++ trunk/s390/VERSION Fri May 13 09:58:22 2011 @@ -1 +1 @@ -2.21.0 +2.21.1 Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?… ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Fri May 13 09:58:22 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 13 03:36:54 EDT 2011 - aschnell(a)suse.de + +- allow to configure zFCP tapes (fate #311718) +- 2.21.1 + +------------------------------------------------------------------- Thu May 05 11:10:41 CEST 2011 - aschnell(a)suse.de - set exclusive architecture to s390 and s390x (bnc #690511) Modified: trunk/s390/src/clients/zfcp_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/zfcp_proposal.y… ============================================================================== --- trunk/s390/src/clients/zfcp_proposal.ycp (original) +++ trunk/s390/src/clients/zfcp_proposal.ycp Fri May 13 09:58:22 2011 @@ -24,7 +24,7 @@ list summary = ZFCPController::Summary(); if (size (summary) == 0) // text for installation summary - summary = [ _("No zFCP disk configured") ]; + summary = [ _("No zFCP device configured") ]; // Fill return map ret = $[ "raw_proposal" : summary, Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Fri May 13 09:58:22 2011 @@ -230,21 +230,6 @@ return $[ "install":[], "remove":[] ]; } -/** - * Check if ZFCP subsystem is available - * @return boolean whether the ZFCP-System is availble at all - */ -global define boolean IsAvailable () { - if (controllers == nil) - { - controllers = (list<map<string,any> >)SCR::Read (.probe.storage); - controllers = filter (map<string,any> c, controllers, { - return c["device"]:"" == "zFCP controller"; - }); - y2milestone ("Found %1 zfcp controllers", size (controllers)); - } - return size (controllers) > 0; -} /** * Get available zfcp controllers @@ -262,28 +247,43 @@ return controllers; } + +/** + * Check if ZFCP subsystem is available + * @return boolean whether the ZFCP-System is availble at all + */ +global boolean IsAvailable() +{ + return size(GetControllers()) > 0; +} + + /** * Get available disks */ -global define void ProbeDisks () { +global void ProbeDisks() +{ /* if (Mode::config ()) return;*/ // popup label - UI::OpenDialog (`Label (_("Reading Configured ZFCP Disks"))); + UI::OpenDialog(`Label(_("Reading Configured ZFCP Devices"))); - list<map<string,any> > disks = (list<map<string,any> >) - SCR::Read (.probe.disk); + list<map<string, any> > disks = (list<map<string, any> >) SCR::Read(.probe.disk); + disks = filter(map<string, any> d, disks, { return d["bus"]:"" == "SCSI"; }); + + list<map<string, any> > tapes = (list<map<string, any> >) SCR::Read(.probe.tape); + tapes = filter(map<string, any> d, tapes, { return d["bus"]:"" == "SCSI"; }); + + list<map<string, any> > disks_tapes = (list<map<string, any> >) merge(disks, tapes); - disks = filter (map<string,any> d, disks, ``( - d["bus"]:"" == "SCSI" - )); integer index = -1; - ZFCPController::devices = listmap (map<string,any> d, disks, ``{ + devices = listmap (map<string, any> d, disks_tapes, { index = index + 1; return $[ index : d ]; }); - UI::CloseDialog (); + + UI::CloseDialog(); } /** @@ -317,7 +317,7 @@ else if (ret == 6) Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not activate ZFCP disk."), id)); + _("%1: Could not activate ZFCP device."), id)); else if (ret == 7) Report::Error (sformat ( // error report, %1 is device identification Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=63… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri May 13 09:58:22 2011 @@ -129,7 +129,7 @@ string help = ZFCP_HELPS["disk_selection"]:""; /* Dialog caption */ - string caption = _("Configured ZFCP Disks"); + string caption = _("Configured ZFCP Devices"); /* Dialog content */ term content = `VBox( @@ -198,7 +198,7 @@ else if (ret == `abort || ret == `cancel) { // yes-no popup - if (! Popup::YesNo (_("Really leave the ZFCP disk configuration without saving? + if (! Popup::YesNo (_("Really leave the ZFCP device configuration without saving? All changes will be lost."))) { ret = nil; @@ -213,7 +213,7 @@ string fcp_lun = descr["detail", "fcp_lun"]:"unknown"; // popup qestion, %1 is device name (eg. /dev/sda) - if (! Popup::YesNo (sformat (_("Remove disk %1?"), dev_name))) + if (! Popup::YesNo (sformat (_("Remove device %1?"), dev_name))) { ret = nil; continue; @@ -252,7 +252,7 @@ string help = ZFCP_HELPS["disk_add"]:""; /* Dialog caption */ - string caption = _("Add New ZFCP Disk"); + string caption = _("Add New ZFCP Device"); string fcp_lun = ZFCPController::previous_settings["fcp_lun"]:""; if (fcp_lun == nil || fcp_lun == "") @@ -341,7 +341,7 @@ else if (ret == `abort || ret == `cancel) { // yes-no popup - if (! Popup::YesNo (_("Really leave the ZFCP disk configuration without saving? + if (! Popup::YesNo (_("Really leave the ZFCP device configuration without saving? All changes will be lost."))) { ret = nil; Modified: trunk/s390/src/zfcp/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/helps.ycp?rev=6398… ============================================================================== --- trunk/s390/src/zfcp/helps.ycp (original) +++ trunk/s390/src/zfcp/helps.ycp Fri May 13 09:58:22 2011 @@ -17,7 +17,7 @@ map ZFCP_HELPS = $[ /* Read dialog help 1/2 */ - "read" : _("<big>Initializing ZFCP Disk Configuration</big> + "read" : _("<big>Initializing ZFCP Device Configuration</big> Please wait... ") + /* Read dialog help 2/2 */ @@ -25,7 +25,7 @@ Safely abort the configuration utility by pressing Abort now."), /* Write dialog help 1/2 */ - "write" : _("<big>Saving ZFCP Disk Configuration</big> + "write" : _("<big>Saving ZFCP Device Configuration</big> Please wait... ") + /* Write dialog help 2/2 */ @@ -34,14 +34,14 @@ An additional dialog informs whether it is safe to do so."), /* Disk selection dialog help 1/3 */ - "disk_selection" : _("<big>Configured ZFCP Disks</big> -In this dialog, manage ZFCP disks on your system.") + + "disk_selection" : _("<big>Configured ZFCP Devices</big> +In this dialog, manage ZFCP devices on your system.") + /* Disk selection dialog help 2/3 */ -_("To configure a new ZFCP disk, click Add.") + +_("To configure a new ZFCP device, click Add.") + /* Disk selection dialog help 3/3 */ -_("To remove a configured ZFCP disk, select it and click +_("To remove a configured ZFCP device, select it and click Delete.") + /* Disk selection dialog Warning */ @@ -50,8 +50,8 @@ Otherwise there is a potential risk of data corruption."), /* Disk add help 1/2 */ - "disk_add" : _("<big>Add New ZFCP Disk</big> -Enter the identifier of the disk to add. Enter the + "disk_add" : _("<big>Add New ZFCP Device</big> +Enter the identifier of the device to add. Enter the Channel Number of the ZFCP controller, the worldwide port number (WWPN), and the FCP-LUN number.") + /* Disk add help 2/2, This is HTML, so finally "<devno>" is displayed as "<devno>" */ -- 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] r63983 - in /branches/SuSE-Code-11-SP2-Branch/s390: ./ package/ src/clients/ src/modules/ src/zfcp/
by aschnell＠svn2.opensuse.org 13 May '11

13 May '11

Author: aschnell Date: Fri May 13 09:52:29 2011 New Revision: 63983 URL: http://svn.opensuse.org/viewcvs/yast?rev=63983&view=rev Log: - allow to configure zFCP tapes (fate #311718) Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes branches/SuSE-Code-11-SP2-Branch/s390/src/clients/dasd_auto.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/clients/zfcp_auto.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/clients/zfcp_proposal.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/modules/ZFCPController.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/zfcp/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/s390/src/zfcp/helps.ycp Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/VERSION Fri May 13 09:52:29 2011 @@ -1 +1 @@ -2.17.16 +2.17.17 Modified: branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes Fri May 13 09:52:29 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 13 03:36:54 EDT 2011 - aschnell(a)suse.de + +- allow to configure zFCP tapes (fate #311718) +- 2.17.17 + +------------------------------------------------------------------- Tue Feb 15 10:47:15 CET 2011 - jsrain(a)suse.cz - added time-out when asking about formatting a disk during Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/clients/dasd_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/clients/dasd_auto.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/clients/dasd_auto.ycp Fri May 13 09:52:29 2011 @@ -83,7 +83,7 @@ ret = DASDController::Read(); Progress::on(); } -/* Write givven settings */ +/* Write given settings */ else if (func == "Write") { import "Progress"; Progress::off(); Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/clients/zfcp_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/clients/zfcp_auto.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/clients/zfcp_auto.ycp Fri May 13 09:52:29 2011 @@ -83,7 +83,7 @@ ret = ZFCPController::Read(); Progress::on(); } -/* Write givven settings */ +/* Write given settings */ else if (func == "Write") { import "Progress"; Progress::off(); Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/clients/zfcp_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/clients/zfcp_proposal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/clients/zfcp_proposal.ycp Fri May 13 09:52:29 2011 @@ -24,7 +24,7 @@ list summary = ZFCPController::Summary(); if (size (summary) == 0) // text for installation summary - summary = [ _("No zFCP disk configured") ]; + summary = [ _("No zFCP device configured") ]; // Fill return map ret = $[ "raw_proposal" : summary, Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/modules/ZFCPController.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/modules/ZFCPController.ycp Fri May 13 09:52:29 2011 @@ -230,21 +230,6 @@ return $[ "install":[], "remove":[] ]; } -/** - * Check if ZFCP subsystem is available - * @return boolean whether the ZFCP-System is availble at all - */ -global define boolean IsAvailable () { - if (controllers == nil) - { - controllers = (list<map<string,any> >)SCR::Read (.probe.storage); - controllers = filter (map<string,any> c, controllers, { - return c["device"]:"" == "zFCP controller"; - }); - y2milestone ("Found %1 zfcp controllers", size (controllers)); - } - return size (controllers) > 0; -} /** * Get available zfcp controllers @@ -262,28 +247,43 @@ return controllers; } + +/** + * Check if ZFCP subsystem is available + * @return boolean whether the ZFCP-System is availble at all + */ +global boolean IsAvailable() +{ + return size(GetControllers()) > 0; +} + + /** * Get available disks */ -global define void ProbeDisks () { +global void ProbeDisks() +{ /* if (Mode::config ()) return;*/ // popup label - UI::OpenDialog (`Label (_("Reading Configured ZFCP Disks"))); + UI::OpenDialog(`Label(_("Reading Configured ZFCP Devices"))); - list<map<string,any> > disks = (list<map<string,any> >) - SCR::Read (.probe.disk); + list<map<string, any> > disks = (list<map<string, any> >) SCR::Read(.probe.disk); + disks = filter(map<string, any> d, disks, { return d["bus"]:"" == "SCSI"; }); + + list<map<string, any> > tapes = (list<map<string, any> >) SCR::Read(.probe.tape); + tapes = filter(map<string, any> d, tapes, { return d["bus"]:"" == "SCSI"; }); + + list<map<string, any> > disks_tapes = (list<map<string, any> >) merge(disks, tapes); - disks = filter (map<string,any> d, disks, ``( - d["bus"]:"" == "SCSI" - )); integer index = -1; - ZFCPController::devices = listmap (map<string,any> d, disks, ``{ + devices = listmap (map<string, any> d, disks_tapes, { index = index + 1; return $[ index : d ]; }); - UI::CloseDialog (); + + UI::CloseDialog(); } /** @@ -317,7 +317,7 @@ else if (ret == 6) Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not activate ZFCP disk."), id)); + _("%1: Could not activate ZFCP device."), id)); else if (ret == 7) Report::Error (sformat ( // error report, %1 is device identification Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/zfcp/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/zfcp/dialogs.ycp Fri May 13 09:52:29 2011 @@ -129,7 +129,7 @@ string help = ZFCP_HELPS["disk_selection"]:""; /* Dialog caption */ - string caption = _("Configured ZFCP Disks"); + string caption = _("Configured ZFCP Devices"); /* Dialog content */ term content = `VBox( @@ -198,7 +198,7 @@ else if (ret == `abort || ret == `cancel) { // yes-no popup - if (! Popup::YesNo (_("Really leave the ZFCP disk configuration without saving? + if (! Popup::YesNo (_("Really leave the ZFCP device configuration without saving? All changes will be lost."))) { ret = nil; @@ -213,7 +213,7 @@ string fcp_lun = descr["detail", "fcp_lun"]:"unknown"; // popup qestion, %1 is device name (eg. /dev/sda) - if (! Popup::YesNo (sformat (_("Remove disk %1?"), dev_name))) + if (! Popup::YesNo (sformat (_("Remove device %1?"), dev_name))) { ret = nil; continue; @@ -252,7 +252,7 @@ string help = ZFCP_HELPS["disk_add"]:""; /* Dialog caption */ - string caption = _("Add New ZFCP Disk"); + string caption = _("Add New ZFCP Device"); string fcp_lun = ZFCPController::previous_settings["fcp_lun"]:""; if (fcp_lun == nil || fcp_lun == "") @@ -341,7 +341,7 @@ else if (ret == `abort || ret == `cancel) { // yes-no popup - if (! Popup::YesNo (_("Really leave the ZFCP disk configuration without saving? + if (! Popup::YesNo (_("Really leave the ZFCP device configuration without saving? All changes will be lost."))) { ret = nil; Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/zfcp/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/zfcp/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/zfcp/helps.ycp Fri May 13 09:52:29 2011 @@ -17,7 +17,7 @@ map ZFCP_HELPS = $[ /* Read dialog help 1/2 */ - "read" : _("<big>Initializing ZFCP Disk Configuration</big> + "read" : _("<big>Initializing ZFCP Device Configuration</big> Please wait... ") + /* Read dialog help 2/2 */ @@ -25,7 +25,7 @@ Safely abort the configuration utility by pressing Abort now."), /* Write dialog help 1/2 */ - "write" : _("<big>Saving ZFCP Disk Configuration</big> + "write" : _("<big>Saving ZFCP Device Configuration</big> Please wait... ") + /* Write dialog help 2/2 */ @@ -34,14 +34,14 @@ An additional dialog informs whether it is safe to do so."), /* Disk selection dialog help 1/3 */ - "disk_selection" : _("<big>Configured ZFCP Disks</big> -In this dialog, manage ZFCP disks on your system.") + + "disk_selection" : _("<big>Configured ZFCP Devices</big> +In this dialog, manage ZFCP devices on your system.") + /* Disk selection dialog help 2/3 */ -_("To configure a new ZFCP disk, click Add.") + +_("To configure a new ZFCP device, click Add.") + /* Disk selection dialog help 3/3 */ -_("To remove a configured ZFCP disk, select it and click +_("To remove a configured ZFCP device, select it and click Delete.") + /* Disk selection dialog Warning */ @@ -50,8 +50,8 @@ Otherwise there is a potential risk of data corruption."), /* Disk add help 1/2 */ - "disk_add" : _("<big>Add New ZFCP Disk</big> -Enter the identifier of the disk to add. Enter the + "disk_add" : _("<big>Add New ZFCP Device</big> +Enter the identifier of the device to add. Enter the Channel Number of the ZFCP controller, the worldwide port number (WWPN), and the FCP-LUN number.") + /* Disk add help 2/2, This is HTML, so finally "<devno>" is displayed as "<devno>" */ -- 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] r63982 - in /trunk/iscsi-client: .cvsignore agents/.cvsignore doc/.cvsignore doc/autodocs/.cvsignore package/.cvsignore src/.cvsignore testsuite/.cvsignore testsuite/tests/.cvsignore
by fehr＠svn2.opensuse.org 12 May '11

12 May '11

Author: fehr Date: Thu May 12 18:26:16 2011 New Revision: 63982 URL: http://svn.opensuse.org/viewcvs/yast?rev=63982&view=rev Log: remove .cvsignore files Removed: trunk/iscsi-client/.cvsignore trunk/iscsi-client/agents/.cvsignore trunk/iscsi-client/doc/.cvsignore trunk/iscsi-client/doc/autodocs/.cvsignore trunk/iscsi-client/package/.cvsignore trunk/iscsi-client/src/.cvsignore trunk/iscsi-client/testsuite/.cvsignore trunk/iscsi-client/testsuite/tests/.cvsignore -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0