January 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63285 - in /trunk/autoinstallation: VERSION package/autoyast2.changes src/clients/inst_autoconfigure.ycp
by ug＠svn2.opensuse.org 31 Jan '11

31 Jan '11

Author: ug Date: Mon Jan 31 14:03:15 2011 New Revision: 63285 URL: http://svn.opensuse.org/viewcvs/yast?rev=63285&view=rev Log: syntax error fixed (missing Mode) Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/inst_autoconfigure.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=632… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Mon Jan 31 14:03:15 2011 @@ -1 +1 @@ -2.20.6 +2.20.7 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 Mon Jan 31 14:03:15 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 31 14:02:23 CET 2011 - ug(a)suse.de + +- syntax error fixed (missing Mode) +- 2.20.7 + +------------------------------------------------------------------- Thu Jan 27 10:07:46 CET 2011 - ug(a)suse.de - typo fixed Modified: trunk/autoinstallation/src/clients/inst_autoconfigure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autoconfigure.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autoconfigure.ycp Mon Jan 31 14:03:15 2011 @@ -19,6 +19,7 @@ import "Call"; import "Y2ModuleConfig"; import "Label"; + import "Mode"; integer current_step = 0; // Required by logStep() -- 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] r63284 - /trunk/theme/openSUSE/wizard/background.png
by coolo＠svn2.opensuse.org 31 Jan '11

31 Jan '11

Author: coolo Date: Mon Jan 31 10:57:49 2011 New Revision: 63284 URL: http://svn.opensuse.org/viewcvs/yast?rev=63284&view=rev Log: yet another background update Modified: trunk/theme/openSUSE/wizard/background.png Modified: trunk/theme/openSUSE/wizard/background.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/background… ============================================================================== Binary files - no diff available. -- 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] r63283 - /tags/stable-2_21_89/gtk/
by rpmcruz＠svn2.opensuse.org 28 Jan '11

28 Jan '11

Author: rpmcruz Date: Fri Jan 28 19:06:55 2011 New Revision: 63283 URL: http://svn.opensuse.org/viewcvs/yast?rev=63283&view=rev Log: Created tag stable-2_21_89 for gtk Added: tags/stable-2_21_89/gtk/ - copied from r63282, trunk/gtk/ -- 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] r63282 - /tags/stable-2_21_89/
by rpmcruz＠svn2.opensuse.org 28 Jan '11

28 Jan '11

Author: rpmcruz Date: Fri Jan 28 19:06:47 2011 New Revision: 63282 URL: http://svn.opensuse.org/viewcvs/yast?rev=63282&view=rev Log: Created tag stable-2_21_89 Added: tags/stable-2_21_89/ -- 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] r63281 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes src/pkg/ygtkpkgdetailview.cc
by rpmcruz＠svn2.opensuse.org 28 Jan '11

28 Jan '11

Author: rpmcruz Date: Fri Jan 28 19:06:39 2011 New Revision: 63281 URL: http://svn.opensuse.org/viewcvs/yast?rev=63281&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes trunk/gtk/src/pkg/ygtkpkgdetailview.cc Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=63281&r1=63280&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Fri Jan 28 19:06:39 2011 @@ -1 +1 @@ -2.21.88 +2.21.89 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=63281&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Fri Jan 28 19:06:39 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "88") +SET(VERSION_PATCH "89") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Fri Jan 28 19:06:39 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jan 28 18:03:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.89 +- sw_single bug fix: the versions box is showing the to-install +as marked for all versions, not merely the one who is actually +going to get installed. (Reported by Atri.) + +------------------------------------------------------------------- Thu Jan 20 20:22:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.88 Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Fri Jan 28 19:06:39 2011 @@ -460,6 +460,7 @@ } modified = sel.toInstall(); } + modified = modified && version.toModify(); if (modified) tooltip = _("Undo"); -- 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] r63280 - /trunk/installation/control/control.openSUSE.xml
by coolo＠svn2.opensuse.org 28 Jan '11

28 Jan '11

Author: coolo Date: Fri Jan 28 13:43:15 2011 New Revision: 63280 URL: http://svn.opensuse.org/viewcvs/yast?rev=63280&view=rev Log: minimal text install has its own pattern now, base is just a base and nothing more Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Fri Jan 28 13:43:15 2011 @@ -329,7 +329,7 @@ <cursor>DMZ</cursor> <packages>xorg-x11</packages> <order config:type="integer">8</order> - <patterns>base</patterns> + <patterns>minimal_base</patterns> <icon>yast-sshd</icon> </one_supported_desktop> -- 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] r63279 - in /trunk/theme: VERSION openSUSE/wizard/background.png openSUSE/wizard/installation.qss package/yast2-theme.changes
by coolo＠svn2.opensuse.org 28 Jan '11

28 Jan '11

Author: coolo Date: Fri Jan 28 11:30:10 2011 New Revision: 63279 URL: http://svn.opensuse.org/viewcvs/yast?rev=63279&view=rev Log: blurr the background Modified: trunk/theme/VERSION trunk/theme/openSUSE/wizard/background.png trunk/theme/openSUSE/wizard/installation.qss trunk/theme/package/yast2-theme.changes Modified: trunk/theme/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/VERSION?rev=63279&r1=63278… ============================================================================== --- trunk/theme/VERSION (original) +++ trunk/theme/VERSION Fri Jan 28 11:30:10 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/theme/openSUSE/wizard/background.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/background… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/wizard/installation.qss URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/installati… ============================================================================== --- trunk/theme/openSUSE/wizard/installation.qss (original) +++ trunk/theme/openSUSE/wizard/installation.qss Fri Jan 28 11:30:10 2011 @@ -38,8 +38,8 @@ } .todo-step-name { - color: #bbbbbb; - font-weight: bold; + color: #ccc; + font-weight: normal; } .todo-step-status { Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.change… ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Fri Jan 28 11:30:10 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 28 10:29:25 UTC 2011 - coolo(a)novell.com + +- blurr the background to increase usability +- 2.20.2 + +------------------------------------------------------------------- Wed Jan 26 12:19:57 UTC 2011 - coolo(a)novell.com - use dark stripes with light text for 11.4 -- 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] r63278 - /trunk/ncurses/src/NCMultiSelectionBox.cc
by gs＠svn2.opensuse.org 27 Jan '11

27 Jan '11

Author: gs Date: Thu Jan 27 13:31:09 2011 New Revision: 63278 URL: http://svn.opensuse.org/viewcvs/yast?rev=63278&view=rev Log: adjaust preferred width Modified: trunk/ncurses/src/NCMultiSelectionBox.cc Modified: trunk/ncurses/src/NCMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCMultiSelectionBox.… ============================================================================== --- trunk/ncurses/src/NCMultiSelectionBox.cc (original) +++ trunk/ncurses/src/NCMultiSelectionBox.cc Thu Jan 27 13:31:09 2011 @@ -40,7 +40,8 @@ int NCMultiSelectionBox::preferredWidth() { - return wGetDefsze().W; + wsze sze = wGetDefsze(); + return sze.W > ( int )( labelWidth() + 2 ) ? sze.W : ( labelWidth() + 2 ); } -- 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] r63277 - in /trunk/autoinstallation: VERSION package/autoyast2.changes src/include/xml.ycp
by ug＠svn2.opensuse.org 27 Jan '11

27 Jan '11

Author: ug Date: Thu Jan 27 10:08:24 2011 New Revision: 63277 URL: http://svn.opensuse.org/viewcvs/yast?rev=63277&view=rev Log: type fixed Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/include/xml.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=632… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Thu Jan 27 10:08:24 2011 @@ -1 +1 @@ -2.20.5 +2.20.6 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 Thu Jan 27 10:08:24 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 27 10:07:46 CET 2011 - ug(a)suse.de + +- typo fixed +- 2.20.6 + +------------------------------------------------------------------- Thu Jan 27 09:52:32 CET 2011 - ug(a)suse.de - added rel_url to CDATA again (needed for ISO on NFS) Modified: trunk/autoinstallation/src/include/xml.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/xml… ============================================================================== --- trunk/autoinstallation/src/include/xml.ycp (original) +++ trunk/autoinstallation/src/include/xml.ycp Thu Jan 27 10:08:24 2011 @@ -99,8 +99,8 @@ "net-udev":"rule" ]; - // rel_url needed for ISO files on NFS - doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config", "location", "script_source", "rel_url"]; + // media_url needed for ISO files on NFS + doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config", "location", "script_source", "media_url"]; // doc["systemID"] = "/usr/share/autoinstall/dtd/profile.dtd"; doc["rootElement"] = "profile"; doc["nameSpace"] = "http://www.suse.com/1.0/yast2ns"; -- 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] r63276 - in /trunk/autoinstallation: VERSION package/autoyast2.changes src/include/xml.ycp
by ug＠svn2.opensuse.org 27 Jan '11

27 Jan '11

Author: ug Date: Thu Jan 27 09:53:27 2011 New Revision: 63276 URL: http://svn.opensuse.org/viewcvs/yast?rev=63276&view=rev Log: rel_url in CDATA again Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/include/xml.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=632… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Thu Jan 27 09:53:27 2011 @@ -1 +1 @@ -2.20.4 +2.20.5 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 Thu Jan 27 09:53:27 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 27 09:52:32 CET 2011 - ug(a)suse.de + +- added rel_url to CDATA again (needed for ISO on NFS) +- 2.20.5 + +------------------------------------------------------------------- Wed Jan 19 15:15:20 CET 2011 - jsrain(a)suse.cz - adaptations for unattended migration (fate#310481) Modified: trunk/autoinstallation/src/include/xml.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/xml… ============================================================================== --- trunk/autoinstallation/src/include/xml.ycp (original) +++ trunk/autoinstallation/src/include/xml.ycp Thu Jan 27 09:53:27 2011 @@ -99,7 +99,8 @@ "net-udev":"rule" ]; - doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config", "location", "script_source"]; + // rel_url needed for ISO files on NFS + doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config", "location", "script_source", "rel_url"]; // doc["systemID"] = "/usr/share/autoinstall/dtd/profile.dtd"; doc["rootElement"] = "profile"; doc["nameSpace"] = "http://www.suse.com/1.0/yast2ns"; -- 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] r63275 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-all.ycp storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: fehr Date: Wed Jan 26 16:05:49 2011 New Revision: 63275 URL: http://svn.opensuse.org/viewcvs/yast?rev=63275&view=rev Log: add button to trigger query for crypt password (bnc #666883) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-all.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Jan 26 16:05:49 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 26 16:03:35 CET 2011 - fehr(a)suse.de + +- add button to trigger query for crypt password (bnc #666883) + +------------------------------------------------------------------- Tue Jan 18 14:49:17 CET 2011 - jsrain(a)suse.cz - adaptations for unattended migration Modified: trunk/storage/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-a… ============================================================================== --- trunk/storage/storage/src/include/ep-all.ycp (original) +++ trunk/storage/storage/src/include/ep-all.ycp Wed Jan 26 16:05:49 2011 @@ -60,6 +60,8 @@ if (true) { // menu entry text configs = add(configs, `item(`id(`multipath), `icon("yast-iscsi-server"), _("Configure &Multipath..."))); + // menu entry text + configs = add(configs, `item(`id(`cryptpwd), `icon("yast-encrypted"), _("Provide Crypt &Passwords..."))); } if (Arch::s390() && IsAvailable("s390")) { @@ -192,6 +194,15 @@ Really call Multipath configuration?"), nil, "multipath-simple"); break; + case `cryptpwd: + map<string,map> tg = Storage::GetTargetMap(); + tg = Storage::AskCryptPasswords( tg ); + Storage::SetTargetMap(tg); + UpdateMainStatus(); + UpdateNavigationTree(nil); + TreePanel::Create(); + break; + case `dasd: // popup text CallConfig(_("Calling DASD configuration cancels all current changes. Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Jan 26 16:05:49 2011 @@ -3451,7 +3451,7 @@ return( ret ); } -map<string, map> AskCryptPasswords( map<string, map> target ) +global map<string, map> AskCryptPasswords( map<string, map> target ) { map crvol = GetCryptLists( target ); boolean ret = true; @@ -3464,6 +3464,8 @@ // header text string header = _("Enter Encryption Password"); + if( Mode::normal() && size(crvol["inactive"]:[])==0 ) + Popup::Error( _("There are no encrypted volume to unlock.")); while( size(crvol["inactive"]:[])>0 && ret ) { ret = CryptVolPopup( crvol["inactive"]:[], crvol["active"]:[] ); -- 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] r63274 - in /branches/SuSE-Linux-11_4-Branch/storage: package/yast2-storage.changes storage/src/include/ep-all.ycp storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: fehr Date: Wed Jan 26 16:05:31 2011 New Revision: 63274 URL: http://svn.opensuse.org/viewcvs/yast?rev=63274&view=rev Log: add button to trigger query for crypt password (bnc #666883) Modified: branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes branches/SuSE-Linux-11_4-Branch/storage/storage/src/include/ep-all.ycp branches/SuSE-Linux-11_4-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/storag… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes Wed Jan 26 16:05:31 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 26 16:03:35 CET 2011 - fehr(a)suse.de + +- add button to trigger query for crypt password (bnc #666883) + +------------------------------------------------------------------- Mon Jan 17 17:28:51 CET 2011 - fehr(a)suse.de - allow floating point value in reserved block percentage and Modified: branches/SuSE-Linux-11_4-Branch/storage/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/storag… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/storage/storage/src/include/ep-all.ycp (original) +++ branches/SuSE-Linux-11_4-Branch/storage/storage/src/include/ep-all.ycp Wed Jan 26 16:05:31 2011 @@ -60,6 +60,8 @@ if (true) { // menu entry text configs = add(configs, `item(`id(`multipath), `icon("yast-iscsi-server"), _("Configure &Multipath..."))); + // menu entry text + configs = add(configs, `item(`id(`cryptpwd), `icon("yast-encrypted"), _("Provide Crypt &Passwords..."))); } if (Arch::s390() && IsAvailable("s390")) { @@ -192,6 +194,15 @@ Really call Multipath configuration?"), nil, "multipath-simple"); break; + case `cryptpwd: + map<string,map> tg = Storage::GetTargetMap(); + tg = Storage::AskCryptPasswords( tg ); + Storage::SetTargetMap(tg); + UpdateMainStatus(); + UpdateNavigationTree(nil); + TreePanel::Create(); + break; + case `dasd: // popup text CallConfig(_("Calling DASD configuration cancels all current changes. Modified: branches/SuSE-Linux-11_4-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/storag… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Linux-11_4-Branch/storage/storage/src/modules/Storage.ycp Wed Jan 26 16:05:31 2011 @@ -3450,7 +3450,7 @@ return( ret ); } -map<string, map> AskCryptPasswords( map<string, map> target ) +global map<string, map> AskCryptPasswords( map<string, map> target ) { map crvol = GetCryptLists( target ); boolean ret = true; @@ -3463,6 +3463,8 @@ // header text string header = _("Enter Encryption Password"); + if( Mode::normal() && size(crvol["inactive"]:[])==0 ) + Popup::Error( _("There are no encrypted volume to unlock.")); while( size(crvol["inactive"]:[])>0 && ret ) { ret = CryptVolPopup( crvol["inactive"]:[], crvol["active"]:[] ); -- 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] r63273 - /tags/branch-SLE-10-SP4-2_13_11/support/
by jsrain＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: jsrain Date: Wed Jan 26 14:37:49 2011 New Revision: 63273 URL: http://svn.opensuse.org/viewcvs/yast?rev=63273&view=rev Log: Created tag branch-SLE-10-SP4-2_13_11 for support Added: tags/branch-SLE-10-SP4-2_13_11/support/ (props changed) - copied from r63272, branches/SuSE-SLE-10-SP4-Branch/support/ -- 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] r63272 - /tags/branch-SLE-10-SP4-2_13_11/
by jsrain＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: jsrain Date: Wed Jan 26 14:37:47 2011 New Revision: 63272 URL: http://svn.opensuse.org/viewcvs/yast?rev=63272&view=rev Log: Created tag branch-SLE-10-SP4-2_13_11 Added: tags/branch-SLE-10-SP4-2_13_11/ -- 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] r63271 - in /branches/SuSE-SLE-10-SP4-Branch/support: VERSION package/yast2-support.changes src/dialogs.ycp
by jsrain＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: jsrain Date: Wed Jan 26 14:37:41 2011 New Revision: 63271 URL: http://svn.opensuse.org/viewcvs/yast?rev=63271&view=rev Log: fixed dialogs and supportconfig call (bnc#665910) Modified: branches/SuSE-SLE-10-SP4-Branch/support/VERSION branches/SuSE-SLE-10-SP4-Branch/support/package/yast2-support.changes branches/SuSE-SLE-10-SP4-Branch/support/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/support/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/suppor… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/support/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/support/VERSION Wed Jan 26 14:37:41 2011 @@ -1 +1 @@ -2.13.10 +2.13.11 Modified: branches/SuSE-SLE-10-SP4-Branch/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/suppor… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/support/package/yast2-support.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/support/package/yast2-support.changes Wed Jan 26 14:37:41 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 26 13:50:40 CET 2011 - jsrain(a)suse.cz + +- fixed dialogs and supportconfig call (bnc#665910) +- 2.13.11 + +------------------------------------------------------------------- Tue May 25 16:50:20 CEST 2009 - mzugec(a)suse.de - removed calls of not-implemented functions Modified: branches/SuSE-SLE-10-SP4-Branch/support/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/suppor… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/support/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/support/src/dialogs.ycp Wed Jan 26 14:37:41 2011 @@ -153,7 +153,7 @@ load_save=`Left( `CheckBoxFrame(`id(`save), _("Save as"), true, `HBox( - `InputField(`id(`save_dir), _("Directory to Save"), home), + `TextEntry(`id(`save_dir), `opt(`hstretch), _("Directory to Save"), home), `VBox( `Label(""), `PushButton(`id(`browse), Label::BrowseButton()) @@ -163,7 +163,7 @@ ); else load_save=`Left( `HBox( - `InputField(`id(`tarball_file), _("Package with log files"), Support::log_files["tarball"]:""), + `TextEntry(`id(`tarball_file), `opt(`hstretch), _("Package with log files"), Support::log_files["tarball"]:""), `VBox(`Label(""), `PushButton(`id(`browse), Label::BrowseButton()))) ); @@ -171,7 +171,7 @@ `VBox( load_save, `CheckBoxFrame(`id(`upload), _("Upload log files tarball into URL"), true, - `Left( `InputField(`id(`url), _("Upload Target"), url) ) + `TextEntry(`id(`url), `opt(`hstretch), _("Upload Target"), url) ) ) ); @@ -304,7 +304,7 @@ /* `Left( `HBox( - `InputField(`id(`log_dir), _("Log directory"), Support::log_files["tmp_dir"]:""), + `TextEntry(`id(`log_dir), `opt(`hstretch), _("Log directory"), Support::log_files["tmp_dir"]:""), `VBox(`Label(""), `PushButton(`id(`browse), Label::BrowseButton())) )), `MultiSelectionBox(`id(`options), _("Options"), items), @@ -425,7 +425,7 @@ any id = UI::QueryWidget(`var_table, `CurrentItem); term row = (term)UI::QueryWidget(`var_table, `Item(id)); UI::OpenDialog(`VBox( - `InputField(`id(`changed_value), row[1]:"", row[2]:""), + `TextEntry(`id(`changed_value), `opt(`hstretch), row[1]:"", row[2]:""), `HBox( `PushButton(`id(`cancel), Label::CancelButton()), `PushButton(`id(`ok), Label::OKButton()) @@ -490,17 +490,17 @@ /* Support configure2 dialog contents */ term contents = `VBox( `Frame (_("Contact Information"), `VBox( - `Left(`InputField(`id(`company), _("Company"), Support::options["VAR_OPTION_CONTACT_COMPANY"]:"")), - `Left(`InputField(`id(`email), _("Email Address"), Support::options["VAR_OPTION_CONTACT_EMAIL"]:"")), - `Left(`InputField(`id(`name), _("Name"), Support::options["VAR_OPTION_CONTACT_NAME"]:"")), - `Left(`InputField(`id(`phone), _("Phone Number"), Support::options["VAR_OPTION_CONTACT_PHONE"]:"")), - `Left(`InputField(`id(`storeid), _("Store ID"), Support::options["VAR_OPTION_CONTACT_STOREID"]:"")), - `Left(`InputField(`id(`terminalid), _("Terminal ID"), Support::options["VAR_OPTION_CONTACT_TERMINALID"]:"")), - `Left(`InputField(`id(`gpg_uid), _("GPG UID"), Support::options["VAR_OPTION_GPG_UID"]:"")) + `TextEntry(`id(`company), `opt(`hstretch), _("Company"), Support::options["VAR_OPTION_CONTACT_COMPANY"]:""), + `TextEntry(`id(`email), `opt(`hstretch), _("Email Address"), Support::options["VAR_OPTION_CONTACT_EMAIL"]:""), + `TextEntry(`id(`name), `opt(`hstretch), _("Name"), Support::options["VAR_OPTION_CONTACT_NAME"]:""), + `TextEntry(`id(`phone), `opt(`hstretch), _("Phone Number"), Support::options["VAR_OPTION_CONTACT_PHONE"]:""), + `TextEntry(`id(`storeid), `opt(`hstretch), _("Store ID"), Support::options["VAR_OPTION_CONTACT_STOREID"]:""), + `TextEntry(`id(`terminalid), `opt(`hstretch), _("Terminal ID"), Support::options["VAR_OPTION_CONTACT_TERMINALID"]:""), + `TextEntry(`id(`gpg_uid), `opt(`hstretch), _("GPG UID"), Support::options["VAR_OPTION_GPG_UID"]:"") )), `Frame (_("Upload Information"), `VBox( - `Left(`InputField(`id(`target), _("Upload Target"), deletechars(Support::options["VAR_OPTION_UPLOAD_TARGET"]:"", "'"))), - `Left(`InputField(`id(`novell_number), _("Novell 11 digit service request number"), Support::novell_number)) + `TextEntry(`id(`target),`opt(`hstretch), _("Upload Target"), deletechars(Support::options["VAR_OPTION_UPLOAD_TARGET"]:"", "'")), + `TextEntry(`id(`novell_number), `opt(`hstretch), _("Novell 11 digit service request number"), Support::novell_number) ))); Wizard::SetContentsButtons(caption, contents, HELPS["contact"]:"", @@ -561,29 +561,28 @@ return `back; integer id = Support::WhoAmI(); SCR::Write (.target.string, Support::pwd_file, Support::root_pw + "\n"); - cmd = sformat("cat %4 | su -c '%1 && chown -R %3 %2'", cmd, Support::log_files["tmp_dir"]:"", id, Support::pwd_file); + cmd = sformat("bash -c \"cat %4 | su -c '%1 && chown -R %3 %2'\"", cmd, Support::log_files["tmp_dir"]:"", id, Support::pwd_file); } symbol ret = nil; - integer pid = (integer) SCR::Execute(.process.start_shell, cmd); + SCR::Execute(.background.run_output, cmd); string unfinished_line = ""; Wizard::DisableNextButton (); - while (true) { - sleep (100); - if (SCR::Read (.process.running, pid) == true) { - string new_text = (string)SCR::Read (.process.read, pid); - if (new_text != nil) - UI::ChangeWidget (`id (`log), `LastLine, new_text); - } else { - Wizard::EnableNextButton (); - break; - } + while((boolean)SCR::Read(.background.output_open) || (boolean)(SCR::Read(.background.newlines) > 0)) { + sleep (100); + list<string> script_out = (list<string>)SCR::Read(.background.newout); + y2internal ("Out: %1", script_out); + foreach (string line, script_out, { + if (line != nil) + UI::ChangeWidget (`id (`log), `LastLine, "\n" + line); + }); ret = (symbol)UI::PollInput(); if (ret == `back || ret == `abort ) { - SCR::Execute (.process.kill, pid); + SCR::Execute (.background.kill); break; } } + Wizard::EnableNextButton (); if (Support::WhoAmI() != 0) SCR::Write (.target.string, Support::pwd_file, ""); while(ret!=`back && ret!=`abort && ret!=`next){ -- 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] r63270 - in /trunk/ncurses-pkg/src: NCPackageSelector.cc NCPackageSelector.h NCPkgPackageDetails.cc NCPkgPopupDescr.cc NCPkgTable.cc
by gs＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: gs Date: Wed Jan 26 14:23:54 2011 New Revision: 63270 URL: http://svn.opensuse.org/viewcvs/yast?rev=63270&view=rev Log: code cleanup: obsolete lines removed, createDescrText renamed to createLicenseText (because only used for licenses) Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPkgPackageDetails.cc trunk/ncurses-pkg/src/NCPkgPopupDescr.cc trunk/ncurses-pkg/src/NCPkgTable.cc Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Wed Jan 26 14:23:54 2011 @@ -373,31 +373,6 @@ packageList->createPatchEntry ( patchPtr, *it); } - /*// get the patch list and sort it - list<ZyppSel> patchList( zyppPatchesBegin (), zyppPatchesEnd () ); - patchList.sort( sortByName ); - list<ZyppSel>::iterator listIt = patchList.begin(); - - while ( listIt != patchList.end() ) - { - ZyppPatch patchPtr = tryCastToZyppPatch( ( *listIt)->theObj() ); - - if ( patchPtr ) - { - string name = patchPtr->name(); - - string::iterator pos = search( name.begin(), name.end(), - expr.begin(), expr.end(), - ic_compare ); - - if ( pos != name.end() ) - { - // search sucessful - packageList->createPatchEntry( patchPtr, *listIt ); - } - } - ++listIt; - }*/ // show the patch list with search result packageList->drawList(); @@ -1255,7 +1230,7 @@ NCPopupInfo * info = new NCPopupInfo ( wpos( NCurses::lines()/10, NCurses::cols()/10), NCPkgStrings::NotifyLabel(), "" + pkgName + " " - + createDescrText( licenseText ), + + createLicenseText( licenseText ), NCPkgStrings::AcceptLabel(), NCPkgStrings::CancelLabel() ); @@ -1327,81 +1302,24 @@ /////////////////////////////////////////////////////////////////// // -// createDescrText -// -#define DOCTYPETAG "" +// createLicenseText +// -string NCPackageSelector::createDescrText( string value ) +#define DOCTYPETAG "" // Special doctype for preformatted HTML + +string NCPackageSelector::createLicenseText( string value ) { string html_text = ""; + const string htmlIdent(DOCTYPETAG); -#ifdef FIXME - bool author_format = false; - bool htmlFormat = false; /* Is the description coming in html? */ - /* By default, this is false and the text is plain text. But if the - * description contains DOCTYPETAG in the first line, it is considered - * to be formatted in html. The yast (this method here) needs not to - * do further formatting for the text part. - */ - - list<string>::const_iterator it = value.begin(); - - string line; - - /* Check if the first line is the html tag */ - if( it != value.end() ) + if ( value.find( htmlIdent ) != string::npos ) { - line = (*it); - const string htmlIdent(DOCTYPETAG); - - if ( line.length() >= htmlIdent.length() && /* Avoid exception if stringlen < len of tag */ - line.substr( 0, htmlIdent.length() ) == htmlIdent ) /* first line == DOCTYPETAG ? */ - { - htmlFormat = true; /* indicate that the text is already html formatted */ - } - else - { - html_text += line + " "; - } - ++it; + html_text = value; // HTML text } - - /** Loop over the remaining text. **/ - const string authors("Authors:"); - while ( it != value.end() ) + else { - line = (*it); - - /* Check if authors-line starts */ - if ( line.length() >= authors.length() && /* Avoid exception if stringlen < len of Authors */ - line.substr( 0, authors.length() ) == authors ) - { - line = " " + line + ""; - author_format = true; - } - if ( author_format ) - { - /* every author in his own line */ - html_text += line + " "; - } - else - { - html_text += " " + line; - if( (! htmlFormat) && (line.length() == 0) ) - { - html_text += " "; - } - else - { - html_text += " "; - } - } - - ++it; + html_text = "<pre>" + value + "</pre>"; // add <pre> to preserve newlines and spaces } -#else - html_text = value; -#endif return html_text; } Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Wed Jan 26 14:23:54 2011 @@ -395,11 +395,11 @@ bool autoChecking() { return autoCheck; } /** - * Creates a text from a list of strings which may contain HTML tags - * @param t used to be list, now a single string. but what does it contain? + * Creates a the license text + * @param t the license string * @return string The text */ - string createDescrText( string t ); + string createLicenseText( string t ); /** * Calls the package mananager (updateDu()) and shows the required disk space Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Wed Jan 26 14:23:54 2011 @@ -277,7 +277,7 @@ // get and format the patch description string value = patchPtr->description(); - //descr += createDescrText( value ); + descr += ""; descr += value; descr += ""; Modified: trunk/ncurses-pkg/src/NCPkgPopupDescr.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDescr.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupDescr.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPopupDescr.cc Wed Jan 26 14:23:54 2011 @@ -134,7 +134,7 @@ headline->setLabel( pkgPtr->summary() ); - descrText->setText( packager->createDescrText(pkgPtr->description()) ); + descrText->setText( pkgPtr->description() ); return true; } Modified: trunk/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.cc?re… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgTable.cc (original) +++ trunk/ncurses-pkg/src/NCPkgTable.cc Wed Jan 26 14:23:54 2011 @@ -213,7 +213,7 @@ if ( objPtr ) { notify = objPtr->delnotify(); - yuiDebug() << "DELETE message: " << notify << endl; + yuiMilestone() << "DELETE message: " << notify << endl; header = NCPkgStrings::WarningLabel(); } break; @@ -223,7 +223,7 @@ if ( objPtr ) { notify = objPtr->insnotify(); - yuiDebug() << "NOTIFY message: " << notify << endl; + yuiMilestone() << "NOTIFY message: " << notify << endl; header = NCPkgStrings::NotifyLabel(); } case S_Update: @@ -248,8 +248,8 @@ { NCPopupInfo * info = new NCPopupInfo( wpos( (lines * 10)/100, (cols * 10) /100), NCPkgStrings::NotifyLabel(), - string( _("End User License Agreement") + - "" + pkgName + " " + packager->createDescrText( license ) ), + string( _("End User License Agreement") + " " + + "" + pkgName + " " + packager->createLicenseText( license ) ), NCPkgStrings::AcceptLabel(), NCPkgStrings::CancelLabel() ); @@ -291,7 +291,7 @@ { NCPopupInfo * info = new NCPopupInfo( wpos( (lines * 35)/100, (cols * 25)/100), header, - "" + pkgName + " " + packager->createDescrText( notify ) + "" + pkgName + " " + notify ); info->setPreferredSize( (NCurses::cols() * 50)/100, (NCurses::lines() * 30)/100); info->showInfoPopup( ); -- 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] r63269 - in /trunk/theme: VERSION package/yast2-theme.changes
by coolo＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: coolo Date: Wed Jan 26 13:20:14 2011 New Revision: 63269 URL: http://svn.opensuse.org/viewcvs/yast?rev=63269&view=rev Log: new version Modified: trunk/theme/VERSION trunk/theme/package/yast2-theme.changes Modified: trunk/theme/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/VERSION?rev=63269&r1=63268… ============================================================================== --- trunk/theme/VERSION (original) +++ trunk/theme/VERSION Wed Jan 26 13:20:14 2011 @@ -1 +1 @@ -2.19.2 +2.20.1 Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.change… ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Wed Jan 26 13:20:14 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 26 12:19:57 UTC 2011 - coolo(a)novell.com + +- use dark stripes with light text for 11.4 +- 2.20.1 + +------------------------------------------------------------------- Wed May 19 10:16:37 CEST 2010 - tgoettlicher(a)suse.de - moved oxygen icons to correct directory -- 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] r63268 - in /trunk/theme/openSUSE/wizard: background.png installation.qss logo.png
by coolo＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: coolo Date: Wed Jan 26 13:19:19 2011 New Revision: 63268 URL: http://svn.opensuse.org/viewcvs/yast?rev=63268&view=rev Log: use dark stripes and light text for 11.4 Modified: trunk/theme/openSUSE/wizard/background.png trunk/theme/openSUSE/wizard/installation.qss trunk/theme/openSUSE/wizard/logo.png Modified: trunk/theme/openSUSE/wizard/background.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/background… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/wizard/installation.qss URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/installati… ============================================================================== --- trunk/theme/openSUSE/wizard/installation.qss (original) +++ trunk/theme/openSUSE/wizard/installation.qss Wed Jan 26 13:19:19 2011 @@ -14,7 +14,7 @@ } #steps { - padding: 90px 2em 1em 0.5em; + padding: 5em 2em 1em 0.5em; background: url(logo.png) no-repeat top left; border: none; font-size: 10pt; @@ -28,41 +28,41 @@ } .current-step-name { - color: #000; + color: white; font-weight: bold; } .done-step-name { font-weight: normal; - color: #444; + color: #dddddd; } .todo-step-name { - color: #000; - font-weight: normal; + color: #bbbbbb; + font-weight: bold; } .todo-step-status { - qproperty-pixmap: url(step-todo.png); + qproperty-pixmap: url(white-step-todo.png); max-width: 14px; min-width: 14px; } .done-step-status { - qproperty-pixmap: url(step-done.png); + qproperty-pixmap: url(white-step-done.png); max-width: 14px; min-width: 14px; } .current-step-status { - qproperty-pixmap: url(step-current.png); + qproperty-pixmap: url(white-step-current.png); max-width: 14px; min-width: 14px; } .steps_heading { font-weight: bold; - color: #444; + color: white; margin: 1em 0 0 0; } @@ -199,7 +199,7 @@ QComboBox QAbstractItemView, QComboBox QMenu { color: black; - background-color: #bebebe; + background: #bebbe; border: 1px solid #888; selection-background-color: #4d8e0d; selection-color: white; @@ -482,6 +482,7 @@ border-radius: 5px; padding: 1px; } - QAbstractScrollArea>* { - border: 0; - } +QAbstractScrollArea>* { + border: 0; +} + Modified: trunk/theme/openSUSE/wizard/logo.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/logo.png?r… ============================================================================== Binary files - no diff available. -- 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] r63267 - in /trunk/printer: package/yast2-printer.changes src/autoconfig.ycp
by jsmeix＠svn2.opensuse.org 25 Jan '11

25 Jan '11

Author: jsmeix Date: Tue Jan 25 16:04:35 2011 New Revision: 63267 URL: http://svn.opensuse.org/viewcvs/yast?rev=63267&view=rev Log: Added in autoconfig.ycp a "&" keyboard shortcut for CheckBox Modified: trunk/printer/package/yast2-printer.changes trunk/printer/src/autoconfig.ycp Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Tue Jan 25 16:04:35 2011 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Jan 25 14:10:21 CET 2011 - jsmeix(a)suse.de -- Adapt the "Driver Packages" dialog because the package +- Adapted the "Driver Packages" dialog because the package "cups-drivers-splix" is renamed to "splix" for openSUSE 11.4 (see Novell/openSUSE Bugzilla bnc#659579). To be backward compatible it tries first to install "splix" Modified: trunk/printer/src/autoconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/autoconfig.ycp?rev=6… ============================================================================== --- trunk/printer/src/autoconfig.ycp (original) +++ trunk/printer/src/autoconfig.ycp Tue Jan 25 16:04:35 2011 @@ -58,7 +58,7 @@ // CheckBox for automatic configuration of USB printers // by installing or removing the RPM package udev-configure-printer. // Do not change or translate "udev-configure-printer", it is a RPM package name. - _("Use the package udev-configure-printer for automated USB printer configuration") + _("&Use the package udev-configure-printer for automated USB printer configuration") ) ), // Have space between the content and the bottom of the dialog: -- 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] r63266 - in /trunk/printer: VERSION package/yast2-printer.changes src/driveradd.ycp
by jsmeix＠svn2.opensuse.org 25 Jan '11

25 Jan '11

Author: jsmeix Date: Tue Jan 25 16:00:23 2011 New Revision: 63266 URL: http://svn.opensuse.org/viewcvs/yast?rev=63266&view=rev Log: - Adapt the "Driver Packages" dialog because the package "cups-drivers-splix" is renamed to "splix" for openSUSE 11.4 (see Novell/openSUSE Bugzilla bnc#659579). To be backward compatible it tries first to install "splix" but if this fails it tries to install "cups-drivers-splix" and it removes both splix and cups-drivers-splix if installed (see Novell/openSUSE Bugzilla bnc#642510). - 2.20.6 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/driveradd.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=63266&r1=632… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Tue Jan 25 16:00:23 2011 @@ -1 +1 @@ -2.20.5 +2.20.6 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Tue Jan 25 16:00:23 2011 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Tue Jan 25 14:10:21 CET 2011 - jsmeix(a)suse.de + +- Adapt the "Driver Packages" dialog because the package + "cups-drivers-splix" is renamed to "splix" for openSUSE 11.4 + (see Novell/openSUSE Bugzilla bnc#659579). + To be backward compatible it tries first to install "splix" + but if this fails it tries to install "cups-drivers-splix" + and it removes both splix and cups-drivers-splix if installed + (see Novell/openSUSE Bugzilla bnc#642510). +- 2.20.6 + +------------------------------------------------------------------- Wed Jan 19 13:28:09 CET 2011 - jsmeix(a)suse.de - Rework the "Autoconfig Settings" dialog and drop the support for Modified: trunk/printer/src/driveradd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/driveradd.ycp?rev=63… ============================================================================== --- trunk/printer/src/driveradd.ycp (original) +++ trunk/printer/src/driveradd.ycp Tue Jan 25 16:00:23 2011 @@ -52,9 +52,10 @@ boolean gutenprint_installed = Printerlib::TestAndInstallPackage( "gutenprint", "installed" ); boolean hplip_installed = Printerlib::TestAndInstallPackage( "hplip", "installed" ); boolean manufacturer_PPDs_installed = Printerlib::TestAndInstallPackage( "manufacturer-PPDs", "installed" ); - boolean cups_drivers_splix_installed = Printerlib::TestAndInstallPackage( "cups-drivers-splix", "installed" ); + boolean splix_installed = Printerlib::TestAndInstallPackage( "splix", "installed" ) + || Printerlib::TestAndInstallPackage( "cups-drivers-splix", "installed" ); boolean m2300w_installed = Printerlib::TestAndInstallPackage( "m2300w", "installed" ); - y2milestone( "entering AddDriverDialog with OpenPrintingPPDs_ghostscript_installed:'%1' OpenPrintingPPDs_hpijs_installed:'%2' OpenPrintingPPDs_postscript_installed:'%3' gutenprint_installed:'%4' hplip_installed:'%5' manufacturer_PPDs_installed:'%6' cups_drivers_splix_installed:'%7' m2300w_installed:'%8'", OpenPrintingPPDs_ghostscript_installed, OpenPrintingPPDs_hpijs_installed, OpenPrintingPPDs_postscript_installed, gutenprint_installed, hplip_installed, manufacturer_PPDs_installed, cups_drivers_splix_installed, m2300w_installed ); + y2milestone( "entering AddDriverDialog with OpenPrintingPPDs_ghostscript_installed:'%1' OpenPrintingPPDs_hpijs_installed:'%2' OpenPrintingPPDs_postscript_installed:'%3' gutenprint_installed:'%4' hplip_installed:'%5' manufacturer_PPDs_installed:'%6' splix_installed:'%7' m2300w_installed:'%8'", OpenPrintingPPDs_ghostscript_installed, OpenPrintingPPDs_hpijs_installed, OpenPrintingPPDs_postscript_installed, gutenprint_installed, hplip_installed, manufacturer_PPDs_installed, splix_installed, m2300w_installed ); term contents = `VBox ( `VStretch(), `Left @@ -132,12 +133,12 @@ ), `Left ( `CheckBox - ( `id("cups-drivers-splix"), - // CheckBox to select or un-select the printer driver package cups-drivers-splix. - // There is no need to have the package name "cups-drivers-splix" in this text + ( `id("splix"), + // CheckBox to select or un-select the printer driver package splix. + // There is no need to have the package name "splix" in this text // because it is shown in a separated column to the left of this text. - "cups-drivers-&splix : " + _("SpliX Driver for SPL Printers without JBIG"), - cups_drivers_splix_installed + "&splix : " + _("SpliX Driver for SPL Printers without JBIG"), + splix_installed ) ), `Left @@ -229,7 +230,7 @@ boolean gutenprint_install = (boolean)UI::QueryWidget( `id("gutenprint"), `Value ); boolean hplip_install = (boolean)UI::QueryWidget( `id("hplip"), `Value ); boolean manufacturer_PPDs_install = (boolean)UI::QueryWidget( `id("manufacturer-PPDs"), `Value ); - boolean cups_drivers_splix_install = (boolean)UI::QueryWidget( `id("cups-drivers-splix"), `Value ); + boolean splix_install = (boolean)UI::QueryWidget( `id("splix"), `Value ); boolean m2300w_install = (boolean)UI::QueryWidget( `id("m2300w"), `Value ); string ppd_path_input_value = (string)UI::QueryWidget( `id("ppd_path_input"), `Value ); // Ignore an effectively empty ppd_path_input_value: @@ -239,7 +240,7 @@ && gutenprint_install == gutenprint_installed && hplip_install == hplip_installed && manufacturer_PPDs_install == manufacturer_PPDs_installed - && cups_drivers_splix_install == cups_drivers_splix_installed + && splix_install == splix_installed && m2300w_install == m2300w_installed && "" == filterchars( ppd_path_input_value, Printer::alnum_chars ) ) @@ -407,15 +408,29 @@ } } } - if( cups_drivers_splix_install != cups_drivers_splix_installed ) - { if( cups_drivers_splix_install ) - { if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "install" ) ) + if( splix_install != splix_installed ) + { if( splix_install ) + { if( Printerlib::TestAndInstallPackage( "splix", "install" ) ) { package_changed = true; } + if( ! Printerlib::TestAndInstallPackage( "splix", "installed" ) ) + { // Try to install the old cups-drivers-splix only if the newer splix was not installed: + if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "install" ) ) + { package_changed = true; + } + } } else - { if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "remove" ) ) - { package_changed = true; + { // Try to remove both splix and cups-drivers-splix if installed: + if( Printerlib::TestAndInstallPackage( "splix", "installed" ) ) + { if( Printerlib::TestAndInstallPackage( "splix", "remove" ) ) + { package_changed = true; + } + } + if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "installed" ) ) + { if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "remove" ) ) + { package_changed = true; + } } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63265 - /trunk/ncurses-pkg/MAINTAINER
by gs＠svn2.opensuse.org 25 Jan '11

25 Jan '11

Author: gs Date: Tue Jan 25 10:51:14 2011 New Revision: 63265 URL: http://svn.opensuse.org/viewcvs/yast?rev=63265&view=rev Log: adjust maintainer Modified: trunk/ncurses-pkg/MAINTAINER Modified: trunk/ncurses-pkg/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/MAINTAINER?rev=63265… ============================================================================== --- trunk/ncurses-pkg/MAINTAINER (original) +++ trunk/ncurses-pkg/MAINTAINER Tue Jan 25 10:51:14 2011 @@ -1 +1 @@ -Katarina Machalkova <kmachalkova(a)suse.cz> +Gabriele Mohr <gs(a)suse.de> -- 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] r63264 - /tags/stable-2_20_1/tune/
by lslezak＠svn2.opensuse.org 25 Jan '11

25 Jan '11

Author: lslezak Date: Tue Jan 25 10:35:05 2011 New Revision: 63264 URL: http://svn.opensuse.org/viewcvs/yast?rev=63264&view=rev Log: Created tag stable-2_20_1 for tune Added: tags/stable-2_20_1/tune/ - copied from r63263, trunk/tune/ -- 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] r63263 - in /trunk/tune: VERSION hwinfo/src/system_settings_dialogs.ycp package/yast2-tune.changes
by lslezak＠svn2.opensuse.org 25 Jan '11

25 Jan '11

Author: lslezak Date: Tue Jan 25 10:34:22 2011 New Revision: 63263 URL: http://svn.opensuse.org/viewcvs/yast?rev=63263&view=rev Log: - kernel settings - 'anticipatory' scheduler option is no longer available (bnc#666768) - 2.20.1 Modified: trunk/tune/VERSION trunk/tune/hwinfo/src/system_settings_dialogs.ycp trunk/tune/package/yast2-tune.changes Modified: trunk/tune/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/VERSION?rev=63263&r1=63262&… ============================================================================== --- trunk/tune/VERSION (original) +++ trunk/tune/VERSION Tue Jan 25 10:34:22 2011 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/tune/hwinfo/src/system_settings_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/system_settings_… ============================================================================== --- trunk/tune/hwinfo/src/system_settings_dialogs.ycp (original) +++ trunk/tune/hwinfo/src/system_settings_dialogs.ycp Tue Jan 25 10:34:22 2011 @@ -76,16 +76,15 @@ * http://www.redhat.com/magazine/008jun05/features/schedulers/ * * elevator= [IOSCHED] - * Format: {"as"|"cfq"|"deadline"|"noop"} + * Format: {"cfq"|"deadline"|"noop"} * See Documentation/block/as-iosched.txt * and Documentation/block/deadline-iosched.txt for details. * - * *'deadline' => Deadline. Database servers, especially those using "TCQ" disks should + * 'deadline' => Deadline. Database servers, especially those using "TCQ" disks should * investigate performance with the 'deadline' IO scheduler. Any system with high * disk performance requirements should do so, in fact. - * *'as' => Anticipatory (the default one) - * *'noop' => NOOP - * 'cfq' => Completely Fair Queuing + * 'noop' => NOOP + * 'cfq' => Completely Fair Queuing (the default) */ "elevator" : $[ "widget" : `custom, @@ -94,8 +93,6 @@ // combo box item - I/O scheduler `item( `id(""), _("Not Configured")), // combo box item - I/O scheduler, do not translate the abbreviation in brackets - `item( `id("as"), _("Anticipatory [as]")), - // combo box item - I/O scheduler, do not translate the abbreviation in brackets `item( `id("cfq"), _("Completely Fair Queuing [cfq]")), // combo box item - I/O scheduler, do not translate the abbreviation in brackets `item( `id("noop"), _("NOOP [noop]")), Modified: trunk/tune/package/yast2-tune.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/package/yast2-tune.changes?… ============================================================================== --- trunk/tune/package/yast2-tune.changes (original) +++ trunk/tune/package/yast2-tune.changes Tue Jan 25 10:34:22 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jan 25 09:09:13 UTC 2011 - lslezak(a)suse.cz + +- kernel settings - 'anticipatory' scheduler option is no longer + available (bnc#666768) +- 2.20.1 + +------------------------------------------------------------------- Thu Oct 7 07:01:30 UTC 2010 - lslezak(a)suse.cz - use Icon.ycp module for displaying icon -- 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] r63262 - /tags/stable-2_20_3/kerberos-client/
by jsuchome＠svn2.opensuse.org 24 Jan '11

24 Jan '11

Author: jsuchome Date: Mon Jan 24 16:21:36 2011 New Revision: 63262 URL: http://svn.opensuse.org/viewcvs/yast?rev=63262&view=rev Log: Created tag stable-2_20_3 for kerberos-client Added: tags/stable-2_20_3/kerberos-client/ - copied from r63261, trunk/kerberos-client/ -- 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] r63261 - in /trunk/kerberos-client: VERSION package/yast2-kerberos-client.changes src/Kerberos.ycp src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 24 Jan '11

24 Jan '11

Author: jsuchome Date: Mon Jan 24 16:21:24 2011 New Revision: 63261 URL: http://svn.opensuse.org/viewcvs/yast?rev=63261&view=rev Log: - do not install pam_krb5 if sssd is configured (bnc#666186) - 2.20.3 Modified: trunk/kerberos-client/VERSION trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/Kerberos.ycp trunk/kerberos-client/src/dialogs.ycp Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=6326… ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Mon Jan 24 16:21:24 2011 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-ke… ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Mon Jan 24 16:21:24 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 24 16:18:57 CET 2011 - jsuchome(a)suse.cz + +- do not install pam_krb5 if sssd is configured (bnc#666186) +- 2.20.3 + +------------------------------------------------------------------- Fri Jan 21 12:26:47 CET 2011 - jsuchome(a)suse.cz - when sssd is configured, update sssd.conf's kerberos values Modified: trunk/kerberos-client/src/Kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/Kerberos.ycp… ============================================================================== --- trunk/kerberos-client/src/Kerberos.ycp (original) +++ trunk/kerberos-client/src/Kerberos.ycp Mon Jan 24 16:21:24 2011 @@ -728,12 +728,27 @@ } /** + * Return the list of packages for kerberos configuration + */ +global list<string> RequiredPackages () { + + list<string> packages = required_packages; + // do not install pam_krb5 if sssd is configured + if (Pam::Enabled ("sss")) + { + packages = filter (string p, packages, ``(p != "pam_krb5")); + } + return packages; +} + + +/** * Return required packages for auto-installation * @return map of packages to be installed and to be removed */ global define map AutoPackages() { return ($[ - "install": required_packages, + "install": RequiredPackages (), "remove": [] ]); } Modified: trunk/kerberos-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/dialogs.ycp?… ============================================================================== --- trunk/kerberos-client/src/dialogs.ycp (original) +++ trunk/kerberos-client/src/dialogs.ycp Mon Jan 24 16:21:24 2011 @@ -383,7 +383,7 @@ } if (result == `next && use_pam_krb) { - if (!Package::InstallAll (Kerberos::required_packages)) + if (!Package::InstallAll (Kerberos::RequiredPackages ())) { result = `not_next; use_pam_krb = 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] r63260 - /tags/stable-2_20_11/ldap-client/
by jsuchome＠svn2.opensuse.org 24 Jan '11

24 Jan '11

Author: jsuchome Date: Mon Jan 24 15:13:56 2011 New Revision: 63260 URL: http://svn.opensuse.org/viewcvs/yast?rev=63260&view=rev Log: Created tag stable-2_20_11 for ldap-client Added: tags/stable-2_20_11/ldap-client/ - copied from r63259, trunk/ldap-client/ -- 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] r63259 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp
by jsuchome＠svn2.opensuse.org 24 Jan '11

24 Jan '11

Author: jsuchome Date: Mon Jan 24 15:13:48 2011 New Revision: 63259 URL: http://svn.opensuse.org/viewcvs/yast?rev=63259&view=rev Log: - look for 'sss' in nsswitch.conf, not for 'sssd' (bnc#666184) - 2.20.11 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=63259&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Mon Jan 24 15:13:48 2011 @@ -1 +1 @@ -2.20.10 +2.20.11 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Mon Jan 24 15:13:48 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 24 15:12:08 CET 2011 - jsuchome(a)suse.cz + +- look for 'sss' in nsswitch.conf, not for 'sssd' (bnc#666184) +- 2.20.11 + +------------------------------------------------------------------- Fri Jan 21 17:01:21 CET 2011 - jsuchome(a)suse.cz - explicitely ask for kerberos+sssd enablement Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=632… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Mon Jan 24 15:13:48 2011 @@ -744,7 +744,7 @@ else { // ... or as 'sssd' - start = contains (nsswitch["passwd"]:[], "sssd"); + start = contains (nsswitch["passwd"]:[], "sss"); } // nothing is configured, but some packages are installed -- 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] r63258 - /tags/stable-2_20_10/ldap-client/
by jsuchome＠svn2.opensuse.org 21 Jan '11

21 Jan '11

Author: jsuchome Date: Fri Jan 21 17:02:14 2011 New Revision: 63258 URL: http://svn.opensuse.org/viewcvs/yast?rev=63258&view=rev Log: Created tag stable-2_20_10 for ldap-client Added: tags/stable-2_20_10/ldap-client/ - copied from r63257, trunk/ldap-client/ -- 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] r63257 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp src/ui.ycp testsuite/tests/Read.out
by jsuchome＠svn2.opensuse.org 21 Jan '11

21 Jan '11

Author: jsuchome Date: Fri Jan 21 17:02:05 2011 New Revision: 63257 URL: http://svn.opensuse.org/viewcvs/yast?rev=63257&view=rev Log: - explicitely ask for kerberos+sssd enablement - 2.20.10 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/ui.ycp trunk/ldap-client/testsuite/tests/Read.out Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=63257&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Fri Jan 21 17:02:05 2011 @@ -1 +1 @@ -2.20.9 +2.20.10 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Fri Jan 21 17:02:05 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 21 17:01:21 CET 2011 - jsuchome(a)suse.cz + +- explicitely ask for kerberos+sssd enablement +- 2.20.10 + +------------------------------------------------------------------- Fri Jan 21 14:40:48 CET 2011 - jsuchome(a)suse.cz - if sssd is active, ask for basic Kerberos settings (fate#308902) Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=632… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Fri Jan 21 17:02:05 2011 @@ -300,12 +300,18 @@ // packages needed for sssd configuration global list<string> sssd_packages = [ "sssd" ]; + // packages needed for sssd + kerberos configuration + global list<string> kerberos_packages = [ "kerberos-client" ]; + // if sssd is used instead of pam_ldap/nss_ldap (fate#308902) global boolean sssd = true; // enable/disable offline authentication ('cache_credentials' key) global boolean sssd_cache_credentials = false; + // if kerberos should be set up for sssd + global boolean sssd_with_krb = false; + // Kerberos default realm (for sssd) global string krb5_realm = ""; @@ -386,8 +392,12 @@ global define map AutoPackages() ``{ if (start) + { required_packages = (list<string>) union (required_packages, sssd ? sssd_packages : pam_nss_packages); + if (sssd_with_krb) + required_packages = (list<string>) union (required_packages, kerberos_packages); + } return ($["install": required_packages, "remove": []]); } @@ -876,7 +886,7 @@ Autologin::Read (); - if (true || Pam::Enabled("krb5")) + if (Pam::Enabled ("krb5")) { ReadKrb5Conf (); } @@ -891,6 +901,10 @@ if (kdc != nil) krb5_kdcip = kdc; } + if (krb5_realm != "" && krb5_kdcip != "") + { + sssd_with_krb = true; + } // Now check if previous configuration of LDAP server didn't proposed // some better values: @@ -2094,7 +2108,7 @@ } // In a mixed Kerberos/LDAP setup the following changes are needed in the [domain/default] section: - if (krb5_realm != "" && krb5_kdcip != "") + if (sssd_with_krb) { SCR::Write (add (domain, "auth_provider"), "krb5"); SCR::Write (add (domain, "chpass_provider"), "krb5"); @@ -2880,6 +2894,8 @@ block<boolean> abort = ``{ return false; }; list<string> needed_packages = sssd ? sssd_packages : pam_nss_packages; + if (sssd_with_krb) + needed_packages = (list<string>) union (needed_packages, kerberos_packages); if (_start_autofs && !Package::Installed("autofs")) { Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=63257… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Fri Jan 21 17:02:05 2011 @@ -516,6 +516,8 @@ } list<string> needed_packages = Ldap::sssd ? Ldap::sssd_packages : Ldap::pam_nss_packages; + if (Ldap::sssd_with_krb) + needed_packages = (list<string>) union (needed_packages, Ldap::kerberos_packages); if (start && !Package::InstalledAll (needed_packages)) { @@ -717,6 +719,7 @@ boolean sssd = Ldap::sssd; string krb5_realm = Ldap::krb5_realm; string krb5_kdcip = Ldap::krb5_kdcip; + boolean sssd_with_krb = Ldap::sssd_with_krb; list<term>member_attributes = [ `item (`id("member"), "member", member_attribute == "member"), @@ -881,6 +884,9 @@ return // frame label `Frame (_("Basic Kerberos Settings"), `HBox (`HSpacing (1), `VBox ( + // checkbox label + `Left (`CheckBox (`id (`sssd_with_krb), `opt (`notify), _("&Use Kerberos"), sssd_with_krb)), + `VSpacing(0.4), // textentry label `TextEntry (`id (`krb5_realm), _("Default Real&m"), krb5_realm), // textentry label @@ -934,6 +940,11 @@ UI::ReplaceWidget (`tabContents, cont); if (has_tabs) UI::ChangeWidget (`id (`tabs), `CurrentItem, `client); + if (sssd) + { + UI::ChangeWidget (`id (`krb5_realm), `Enabled, sssd_with_krb); + UI::ChangeWidget (`id (`krb5_kdcip), `Enabled, sssd_with_krb); + } } define void set_admin_term () { @@ -1107,6 +1118,12 @@ sssd = (boolean) UI::QueryWidget (`id (`sssd), `Value); UI::ReplaceWidget (`id (`rp_frame), sssd ? get_frame_krb () : get_frame_nss ()); } + if (result == `sssd_with_krb) + { + sssd_with_krb = (boolean) UI::QueryWidget (`id (`sssd_with_krb), `Value); + UI::ChangeWidget (`id (`krb5_realm), `Enabled, sssd_with_krb); + UI::ChangeWidget (`id (`krb5_kdcip), `Enabled, sssd_with_krb); + } if (result == `br_tls_cacertdir) { string dir = UI::AskForExistingDirectory (tls_cacertdir, _("Choose the directory with certificates")); @@ -1281,6 +1298,8 @@ Ldap::ppolicies[dn] = pp; } }); + if (krb5_realm == "" || krb5_kdcip == "" || !sssd) + sssd_with_krb = false; if (Ldap::GetMainConfigDN() != base_config_dn || Ldap::bind_dn != bind_dn || @@ -1314,6 +1333,7 @@ Ldap::sssd = sssd; Ldap::krb5_realm = krb5_realm; Ldap::krb5_kdcip = krb5_kdcip; + Ldap::sssd_with_krb = sssd_with_krb; Ldap::modified = true; } break; Modified: trunk/ldap-client/testsuite/tests/Read.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Read… ============================================================================== --- trunk/ldap-client/testsuite/tests/Read.out (original) +++ trunk/ldap-client/testsuite/tests/Read.out Fri Jan 21 17:02:05 2011 @@ -16,8 +16,6 @@ Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_map_attribute" 0 Execute .passwd.init $["base_directory":"/etc"] true Read .passwd.passwd.pluslines ["+"] -Read .etc.krb5_conf.v.libdefaults.default_realm ["SUSE.CZ"] -Read .etc.krb5_conf.v."SUSE.CZ"."kdc" ["kdc.suse.cz"] Return true Dump ============================================ Dump ldap used: -true- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63256 - /tags/stable-2_20_9/ldap-client/
by jsuchome＠svn2.opensuse.org 21 Jan '11

21 Jan '11

Author: jsuchome Date: Fri Jan 21 16:23:52 2011 New Revision: 63256 URL: http://svn.opensuse.org/viewcvs/yast?rev=63256&view=rev Log: Created tag stable-2_20_9 for ldap-client Added: tags/stable-2_20_9/ldap-client/ - copied from r63255, trunk/ldap-client/ -- 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] r63255 - in /trunk/ldap-client: ./ agents/ package/ src/ testsuite/tests/
by jsuchome＠svn2.opensuse.org 21 Jan '11

21 Jan '11

Author: jsuchome Date: Fri Jan 21 16:23:42 2011 New Revision: 63255 URL: http://svn.opensuse.org/viewcvs/yast?rev=63255&view=rev Log: - if sssd is active, ask for basic Kerberos settings (fate#308902) - 2.20.9 Modified: trunk/ldap-client/VERSION trunk/ldap-client/agents/Makefile.am trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/ui.ycp trunk/ldap-client/testsuite/tests/Export.out trunk/ldap-client/testsuite/tests/Export.ycp trunk/ldap-client/testsuite/tests/Read.out trunk/ldap-client/testsuite/tests/Read.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=63255&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Fri Jan 21 16:23:42 2011 @@ -1 +1 @@ -2.20.8 +2.20.9 Modified: trunk/ldap-client/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/agents/Makefile.am?r… ============================================================================== --- trunk/ldap-client/agents/Makefile.am (original) +++ trunk/ldap-client/agents/Makefile.am Fri Jan 21 16:23:42 2011 @@ -5,8 +5,7 @@ # scrconf_DATA = ldap_conf.scr \ - cfg_ldap.scr \ - etc_sssd_conf.scr + cfg_ldap.scr fillup_DATA = sysconfig.ldap Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Fri Jan 21 16:23:42 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 21 14:40:48 CET 2011 - jsuchome(a)suse.cz + +- if sssd is active, ask for basic Kerberos settings (fate#308902) +- 2.20.9 + +------------------------------------------------------------------- Fri Jan 21 12:27:22 CET 2011 - jsuchome(a)suse.cz - agent for sssd.conf moved to yast2-pam to be accessible for Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=632… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Fri Jan 21 16:23:42 2011 @@ -306,6 +306,12 @@ // enable/disable offline authentication ('cache_credentials' key) global boolean sssd_cache_credentials = false; + // Kerberos default realm (for sssd) + global string krb5_realm = ""; + + // adress of KDC (key distribution centre) server for default realm + global string krb5_kdcip = ""; + //---------------------------------------------------------------- /** @@ -415,6 +421,8 @@ tls_checkpeer = settings ["tls_checkpeer"]:"yes"; mkhomedir = settings ["mkhomedir"]:mkhomedir; sssd = settings ["sssd"]:sssd; + krb5_realm = settings ["krb5_realm"]:krb5_realm; + krb5_kdcip = settings ["krb5_kdcip"]:krb5_kdcip; if (_start_autofs) required_packages = (list<string>) union (required_packages, ["autofs"]); @@ -457,7 +465,7 @@ "create_ldap" : create_ldap, "login_enabled" : login_enabled, "mkhomedir" : mkhomedir, - "sssd" : sssd + "sssd" : sssd, ]; if (tls_checkpeer != "yes") e["tls_checkpeer"] = tls_checkpeer; @@ -473,6 +481,10 @@ e["nss_base_group"] = nss_base_group; if (_autofs_allowed) e["start_autofs"] = _start_autofs; + if (krb5_realm != "") + e["krb5_realm"] = krb5_realm; + if (krb5_kdcip != "") + e["krb5_kdcip"] = krb5_kdcip; return e; } @@ -543,6 +555,26 @@ /* ------------- read/write functions ------------------------------- */ /** + * For sssd, some kerberos values are needed + */ + global boolean ReadKrb5Conf () + { + + list<string> realm = (list<string>) SCR::Read (.etc.krb5_conf.v.libdefaults.default_realm); + if (realm == nil) + realm = []; + krb5_realm = realm[0]:""; + + list<string> kdcs = (list<string>) SCR::Read (add (add (.etc.krb5_conf.v, krb5_realm), "kdc")); + if (kdcs == nil) + kdcs = []; + krb5_kdcip = mergestring (kdcs, " "); + + return true; + } + + + /** * Read single entry from /etc/ldap.conf file * @param entry entry name * @param defvalue default value if entry is not present @@ -844,6 +876,21 @@ Autologin::Read (); + if (true || Pam::Enabled("krb5")) + { + ReadKrb5Conf (); + } + if (FileUtils::Exists ("/etc/sssd/sssd.conf")) + { + // read realm and kdc from sssd.conf if available + path domain = add (.etc.sssd_conf.v, "domain/default"); + string realm = (string) SCR::Read (add (domain, "krb5_realm")); + if (realm != nil) + krb5_realm = realm; + string kdc = (string) SCR::Read (add (domain, "krb5_kdcip")); + if (kdc != nil) + krb5_kdcip = kdc; + } // Now check if previous configuration of LDAP server didn't proposed // some better values: @@ -2047,31 +2094,13 @@ } // In a mixed Kerberos/LDAP setup the following changes are needed in the [domain/default] section: - if (Pam::Enabled("krb5")) + if (krb5_realm != "" && krb5_kdcip != "") { -// FIXME: do not test for pam, it may be already off... SCR::Write (add (domain, "auth_provider"), "krb5"); SCR::Write (add (domain, "chpass_provider"), "krb5"); - /* - FIXME how to read krb settings: - a) use agent directly (moved out from yast2-kerberos-client) - b) use Read + Export of Kerberos.ycp - - * Set "krb5_kdcip" to the hostname of the kerberos kdc - * Set "krb5_realm" to kerberos realm - */ - if (Package::Installed ("yast2-kerberos-client")) - { - WFM::CallFunction ("kerberos-client_auto", ["Read"]); - any e = WFM::CallFunction ("kerberos-client_auto",["Export"]); - if (is (e,map) && e != $[]) - { - map kerberos = (map) e; - SCR::Write (add (domain, "krb5_realm"), kerberos["kerberos_client","default_realm"]:nil); - SCR::Write (add (domain, "krb5_kdcip"), kerberos["kerberos_client","kdc_server"]:nil); - } - } + SCR::Write (add (domain, "krb5_realm"), krb5_realm); + SCR::Write (add (domain, "krb5_kdcip"), krb5_kdcip); } else { Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=63255… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Fri Jan 21 16:23:42 2011 @@ -715,6 +715,8 @@ string tls_cacertdir = Ldap::tls_cacertdir; string tls_cacertfile = Ldap::tls_cacertfile; boolean sssd = Ldap::sssd; + string krb5_realm = Ldap::krb5_realm; + string krb5_kdcip = Ldap::krb5_kdcip; list<term>member_attributes = [ `item (`id("member"), "member", member_attribute == "member"), @@ -833,12 +835,8 @@ ); } - define void set_client_term () { - - term cont = `Top (`HBox(`HSpacing (5), `VBox( - `VSpacing(0.4), - `Left (`CheckBox (`id (`sssd), `opt (`notify), _("Use S&ystem Security Services Daemon (SSSD)"), sssd)), - `VSpacing(0.4), + term get_frame_nss () { + return // frame label `Frame (_("Naming Contexts"), `HBox( `HSpacing (1), `VBox( @@ -876,7 +874,28 @@ `VSpacing(0.4) ), `HSpacing (1) - )), + )); + } + + term get_frame_krb () { + return + // frame label + `Frame (_("Basic Kerberos Settings"), `HBox (`HSpacing (1), `VBox ( + // textentry label + `TextEntry (`id (`krb5_realm), _("Default Real&m"), krb5_realm), + // textentry label + `TextEntry (`id (`krb5_kdcip), _("&KDC Server Address"), krb5_kdcip), + `VSpacing (0.4) + ), `HSpacing (1))); + } + + define void set_client_term () { + + term cont = `Top (`HBox(`HSpacing (5), `VBox( + `VSpacing(0.4), + `Left (`CheckBox (`id (`sssd), `opt (`notify), _("Use S&ystem Security Services Daemon (SSSD)"), sssd)), + `VSpacing(0.4), + `ReplacePoint (`id (`rp_frame), `VBox (sssd ? get_frame_krb () : get_frame_nss ())), `VSpacing (0.4), `ComboBox (`id (`pam_password), `opt(`notify,`hstretch,`editable), // combobox label @@ -915,10 +934,6 @@ UI::ReplaceWidget (`tabContents, cont); if (has_tabs) UI::ChangeWidget (`id (`tabs), `CurrentItem, `client); - - foreach (symbol ui, [ `nss_base_passwd, `nss_base_group, `nss_base_shadow, `br_passwd, `br_shadow, `br_group ], { - UI::ChangeWidget (`id (ui), `Enabled, UI::QueryWidget (`id (`sssd), `Value) == false); - }); } define void set_admin_term () { @@ -1014,12 +1029,23 @@ if (current == `client) { member_attribute =(string)UI::QueryWidget(`id(`group_style),`Value); - nss_base_passwd = (string) - UI::QueryWidget(`id(`nss_base_passwd),`Value); - nss_base_shadow = (string) - UI::QueryWidget(`id(`nss_base_shadow),`Value); - nss_base_group = (string) - UI::QueryWidget(`id(`nss_base_group),`Value); + + if (sssd) + { + krb5_realm = (string) + UI::QueryWidget (`id (`krb5_realm), `Value); + krb5_kdcip = (string) + UI::QueryWidget (`id (`krb5_kdcip), `Value); + } + else + { + nss_base_passwd = (string) + UI::QueryWidget(`id(`nss_base_passwd),`Value); + nss_base_shadow = (string) + UI::QueryWidget(`id(`nss_base_shadow),`Value); + nss_base_group = (string) + UI::QueryWidget(`id(`nss_base_group),`Value); + } pam_password = (string) UI::QueryWidget(`id(`pam_password), `Value); tls_cacertfile = (string) UI::QueryWidget(`id(`tls_cacertfile), `Value); @@ -1079,9 +1105,7 @@ if (result == `sssd) { sssd = (boolean) UI::QueryWidget (`id (`sssd), `Value); - foreach (symbol ui, [ `nss_base_passwd, `nss_base_group, `nss_base_shadow, `br_passwd, `br_shadow, `br_group ], { - UI::ChangeWidget (`id (ui), `Enabled, !sssd); - }); + UI::ReplaceWidget (`id (`rp_frame), sssd ? get_frame_krb () : get_frame_nss ()); } if (result == `br_tls_cacertdir) { @@ -1270,7 +1294,9 @@ Ldap::ldap_v2 != ldap_v2 || Ldap::tls_cacertdir != tls_cacertdir || Ldap::tls_cacertfile != tls_cacertfile || - Ldap::sssd != sssd + Ldap::sssd != sssd || + Ldap::krb5_realm != krb5_realm || + Ldap::krb5_kdcip != krb5_kdcip ) { Ldap::bind_dn = bind_dn; @@ -1286,6 +1312,8 @@ Ldap::tls_cacertdir = tls_cacertdir; Ldap::tls_cacertfile = tls_cacertfile; Ldap::sssd = sssd; + Ldap::krb5_realm = krb5_realm; + Ldap::krb5_kdcip = krb5_kdcip; Ldap::modified = true; } break; Modified: trunk/ldap-client/testsuite/tests/Export.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Expo… ============================================================================== --- trunk/ldap-client/testsuite/tests/Export.out (original) +++ trunk/ldap-client/testsuite/tests/Export.out Fri Jan 21 16:23:42 2011 @@ -17,6 +17,8 @@ Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_map_attribute" 0 Execute .passwd.init $["base_directory":"/etc"] true Read .passwd.passwd.pluslines ["+"] +Read .etc.krb5_conf.v.libdefaults.default_realm ["SUSE.CZ"] +Read .etc.krb5_conf.v."SUSE.CZ"."kdc" ["kdc.suse.cz"] Return true Dump ============================================ -Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":false, "start_autofs":false, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldap_v2":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":false, "start_autofs":false, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] Modified: trunk/ldap-client/testsuite/tests/Export.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Expo… ============================================================================== --- trunk/ldap-client/testsuite/tests/Export.ycp (original) +++ trunk/ldap-client/testsuite/tests/Export.ycp Fri Jan 21 16:23:42 2011 @@ -36,6 +36,16 @@ ] ] ], + "krb5_conf" : $[ + "v" : $[ + "libdefaults": $[ + "default_realm": ["SUSE.CZ"], + ], + "SUSE.CZ": $[ + "kdc": ["kdc.suse.cz"], + ], + ], + ], // /etc/security/pam_* "security": $[ "section": $[ Modified: trunk/ldap-client/testsuite/tests/Read.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Read… ============================================================================== --- trunk/ldap-client/testsuite/tests/Read.out (original) +++ trunk/ldap-client/testsuite/tests/Read.out Fri Jan 21 16:23:42 2011 @@ -16,6 +16,8 @@ Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_map_attribute" 0 Execute .passwd.init $["base_directory":"/etc"] true Read .passwd.passwd.pluslines ["+"] +Read .etc.krb5_conf.v.libdefaults.default_realm ["SUSE.CZ"] +Read .etc.krb5_conf.v."SUSE.CZ"."kdc" ["kdc.suse.cz"] Return true Dump ============================================ Dump ldap used: -true- Modified: trunk/ldap-client/testsuite/tests/Read.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/Read… ============================================================================== --- trunk/ldap-client/testsuite/tests/Read.ycp (original) +++ trunk/ldap-client/testsuite/tests/Read.ycp Fri Jan 21 16:23:42 2011 @@ -36,6 +36,16 @@ ] ] ], + "krb5_conf" : $[ + "v" : $[ + "libdefaults": $[ + "default_realm": ["SUSE.CZ"], + ], + "SUSE.CZ": $[ + "kdc": ["kdc.suse.cz"], + ], + ], + ], // /etc/security/pam_* "security": $[ "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] r63254 - in /trunk/ldap-client: agents/etc_sssd_conf.scr package/yast2-ldap-client.changes yast2-ldap-client.spec.in
by jsuchome＠svn2.opensuse.org 21 Jan '11

21 Jan '11

Author: jsuchome Date: Fri Jan 21 13:16:20 2011 New Revision: 63254 URL: http://svn.opensuse.org/viewcvs/yast?rev=63254&view=rev Log: - agent for sssd.conf moved to yast2-pam to be accessible for kerberos-client Removed: trunk/ldap-client/agents/etc_sssd_conf.scr Modified: trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/yast2-ldap-client.spec.in Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Fri Jan 21 13:16:20 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 21 12:27:22 CET 2011 - jsuchome(a)suse.cz + +- agent for sssd.conf moved to yast2-pam to be accessible for + kerberos-client + +------------------------------------------------------------------- Thu Jan 20 16:41:00 CET 2011 - jsuchome(a)suse.cz - write default_realm as realm Modified: trunk/ldap-client/yast2-ldap-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/yast2-ldap-client.sp… ============================================================================== --- trunk/ldap-client/yast2-ldap-client.spec.in (original) +++ trunk/ldap-client/yast2-ldap-client.spec.in Fri Jan 21 13:16:20 2011 @@ -16,8 +16,9 @@ # removed lowercasing of LDAP object names Requires: yast2-ldap >= 2.17.1 -# new API of Pam.ycp -Requires: yast2-pam >= 2.14.0 +# etc_sssd_conf.scr +Requires: yast2-pam >= 2.20.0 + Provides: yast2-config-ldap_client Obsoletes: yast2-config-ldap_client Provides: yast2-trans-ldap_client -- 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] r63253 - /tags/stable-2_20_2/kerberos-client/
by jsuchome＠svn2.opensuse.org 21 Jan '11

21 Jan '11

Author: jsuchome Date: Fri Jan 21 13:04:49 2011 New Revision: 63253 URL: http://svn.opensuse.org/viewcvs/yast?rev=63253&view=rev Log: Created tag stable-2_20_2 for kerberos-client Added: tags/stable-2_20_2/kerberos-client/ - copied from r63252, trunk/kerberos-client/ -- 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] r63252 - in /trunk/kerberos-client: VERSION agents/etc_krb5_conf.scr package/yast2-kerberos-client.changes src/Kerberos.ycp yast2-kerberos-client.spec.in
by jsuchome＠svn2.opensuse.org 21 Jan '11

21 Jan '11

Author: jsuchome Date: Fri Jan 21 13:03:18 2011 New Revision: 63252 URL: http://svn.opensuse.org/viewcvs/yast?rev=63252&view=rev Log: - when sssd is configured, update sssd.conf's kerberos values - agent for krb5.conf moved to yast2-pam to be usable by ldap-client - 2.20.2 Removed: trunk/kerberos-client/agents/etc_krb5_conf.scr Modified: trunk/kerberos-client/VERSION trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/Kerberos.ycp trunk/kerberos-client/yast2-kerberos-client.spec.in Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=6325… ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Fri Jan 21 13:03:18 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-ke… ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Fri Jan 21 13:03:18 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 21 12:26:47 CET 2011 - jsuchome(a)suse.cz + +- when sssd is configured, update sssd.conf's kerberos values +- agent for krb5.conf moved to yast2-pam to be usable by ldap-client +- 2.20.2 + +------------------------------------------------------------------- Thu Jan 20 16:12:22 CET 2011 - jsuchome(a)suse.cz - do not use pam_krb5 when sssd is configured Modified: trunk/kerberos-client/src/Kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/Kerberos.ycp… ============================================================================== --- trunk/kerberos-client/src/Kerberos.ycp (original) +++ trunk/kerberos-client/src/Kerberos.ycp Fri Jan 21 13:03:18 2011 @@ -482,10 +482,24 @@ // -- pam settings if (pam_modified || write_only) { + // whem sssd is configured, do not use pam_krb5 and update sssd.conf + // fate#308902 if (Pam::Enabled ("sss")) { y2milestone ("not using pam_krb5 because sssd is configured"); Pam::Remove ("krb5"); + + y2milestone ("updating sssd.conf with new kerberos values"); + + path domain = add (.etc.sssd_conf.v, "domain/default"); + SCR::Write (add (domain, "auth_provider"), "krb5"); + SCR::Write (add (domain, "chpass_provider"), "krb5"); + SCR::Write (add (domain, "krb5_realm"), default_realm); + SCR::Write (add (domain, "krb5_kdcip"), kdc); + if (!SCR::Write(.etc.sssd_conf, nil)) + { + y2error ("error writing ldap.conf file"); + } } else if (use_pam_krb) { Modified: trunk/kerberos-client/yast2-kerberos-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/yast2-kerberos-c… ============================================================================== --- trunk/kerberos-client/yast2-kerberos-client.spec.in (original) +++ trunk/kerberos-client/yast2-kerberos-client.spec.in Fri Jan 21 13:03:18 2011 @@ -5,8 +5,8 @@ License: GPL v2 or later BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-pam yast2-testsuite -# new Pam.ycp API -Requires: yast2-pam >= 2.14.0 +# etc_krb5_conf.scr +Requires: yast2-pam >= 2.20.0 # Hostname::CurrentDomain, CurrentHostname Requires: yast2 >= 2.16.48 -- 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] r63251 - /tags/stable-2_20_0/pam/
by jsuchome＠svn2.opensuse.org 21 Jan '11

21 Jan '11

Author: jsuchome Date: Fri Jan 21 13:02:45 2011 New Revision: 63251 URL: http://svn.opensuse.org/viewcvs/yast?rev=63251&view=rev Log: Created tag stable-2_20_0 for pam Added: tags/stable-2_20_0/pam/ - copied from r63250, trunk/pam/ -- 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] r63250 - in /trunk/pam: VERSION agents/etc_krb5_conf.scr agents/etc_sssd_conf.scr package/yast2-pam.changes
by jsuchome＠svn2.opensuse.org 21 Jan '11

21 Jan '11

Author: jsuchome Date: Fri Jan 21 13:02:34 2011 New Revision: 63250 URL: http://svn.opensuse.org/viewcvs/yast?rev=63250&view=rev Log: - agents for accessing krb5.conf and sssd.conf moved here, so they are available in more modules - 2.20.0 Added: trunk/pam/agents/etc_krb5_conf.scr - copied unchanged from r63014, trunk/kerberos-client/agents/etc_krb5_conf.scr trunk/pam/agents/etc_sssd_conf.scr - copied unchanged from r63165, trunk/ldap-client/agents/etc_sssd_conf.scr Modified: trunk/pam/VERSION trunk/pam/package/yast2-pam.changes Modified: trunk/pam/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/VERSION?rev=63250&r1=63249&r… ============================================================================== --- trunk/pam/VERSION (original) +++ trunk/pam/VERSION Fri Jan 21 13:02:34 2011 @@ -1 +1 @@ -2.19.2 +2.20.0 Modified: trunk/pam/package/yast2-pam.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/package/yast2-pam.changes?re… ============================================================================== --- trunk/pam/package/yast2-pam.changes (original) +++ trunk/pam/package/yast2-pam.changes Fri Jan 21 13:02:34 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 21 12:21:29 CET 2011 - jsuchome(a)suse.cz + +- agents for accessing krb5.conf and sssd.conf moved here, + so they are available in more modules +- 2.20.0 + +------------------------------------------------------------------- Thu Jul 15 13:30:24 CEST 2010 - jsuchome(a)suse.cz - use full path for pam-config -- 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] r63249 - /tags/stable-2_21_88/gtk/
by rpmcruz＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: rpmcruz Date: Thu Jan 20 21:28:07 2011 New Revision: 63249 URL: http://svn.opensuse.org/viewcvs/yast?rev=63249&view=rev Log: Created tag stable-2_21_88 for gtk Added: tags/stable-2_21_88/gtk/ - copied from r63248, trunk/gtk/ -- 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] r63248 - /tags/stable-2_21_88/
by rpmcruz＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: rpmcruz Date: Thu Jan 20 21:27:58 2011 New Revision: 63248 URL: http://svn.opensuse.org/viewcvs/yast?rev=63248&view=rev Log: Created tag stable-2_21_88 Added: tags/stable-2_21_88/ -- 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] r63247 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: rpmcruz Date: Thu Jan 20 21:27:52 2011 New Revision: 63247 URL: http://svn.opensuse.org/viewcvs/yast?rev=63247&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=63247&r1=63246&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Thu Jan 20 21:27:52 2011 @@ -1 +1 @@ -2.21.87 +2.21.88 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=63247&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Thu Jan 20 21:27:52 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "87") +SET(VERSION_PATCH "88") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Thu Jan 20 21:27:52 2011 @@ -1,8 +1,10 @@ ------------------------------------------------------------------- - +Thu Jan 20 20:22:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.88 -- feature: move window by dragging the header. +- sw_single: using buttons instead of radios for the +versions-box. +- allow moving window by dragging the header. ------------------------------------------------------------------- Wed Jan 05 23:00:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt -- 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] r63246 - in /trunk/gtk/src/pkg: ygtkpkgdetailview.cc yzyppwrapper.cc
by rpmcruz＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: rpmcruz Date: Thu Jan 20 21:22:05 2011 New Revision: 63246 URL: http://svn.opensuse.org/viewcvs/yast?rev=63246&view=rev Log: * improved Atri versions-box style. * got rid of radio style: Atri style is now the default. Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc trunk/gtk/src/pkg/yzyppwrapper.cc Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Thu Jan 20 21:22:05 2011 @@ -21,8 +21,6 @@ #include "ygtkpkglistview.h" #include <YStringTree.h> -//#define ATRI_BUTTONS - #define BROWSER_BIN "/usr/bin/firefox" #define GNOME_OPEN_BIN "/usr/bin/gnome-open" @@ -33,12 +31,7 @@ return s; } -#if 0 -static const char *keywordOpenTag = ""; -static const char *keywordCloseTag = ""; -#else static const char *keywordOpenTag = "<keyword>", *keywordCloseTag = "</keyword>"; -#endif struct BusyOp { BusyOp() { @@ -365,142 +358,52 @@ { return zyppPool().byKindEnd<zypp::SrcPackage>(); } struct VersionExpander : public DetailExpander { - GtkWidget *box, *versions_box, *button, *undo_button; + GtkWidget *versions_box; std::list <Ypp::Version> versions; VersionExpander() : DetailExpander (_("Versions"), false) { - button = gtk_button_new_with_label (""); - g_signal_connect (G_OBJECT (button), "clicked", - G_CALLBACK (button_clicked_cb), this); - - GtkSettings *settings = gtk_settings_get_default(); - gboolean show_button_images; - g_object_get (settings, "gtk-button-images", &show_button_images, NULL); - if (show_button_images) { - undo_button = gtk_button_new_with_label (""); - gtk_button_set_image (GTK_BUTTON (undo_button), - gtk_image_new_from_stock (GTK_STOCK_UNDO, GTK_ICON_SIZE_BUTTON)); - gtk_widget_set_tooltip_text (undo_button, _("Undo")); - } - else - undo_button = gtk_button_new_with_label (_("Undo")); - g_signal_connect (G_OBJECT (undo_button), "clicked", - G_CALLBACK (undo_clicked_cb), this); - versions_box = gtk_vbox_new (FALSE, 2); - GtkWidget *button_box = gtk_hbox_new (FALSE, 6); - gtk_box_pack_end (GTK_BOX (button_box), undo_button, FALSE, TRUE, 0); - gtk_box_pack_end (GTK_BOX (button_box), button, FALSE, TRUE, 0); - - box = gtk_vbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (box), versions_box, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (box), button_box, FALSE, TRUE, 0); - -#if 1 // draw border all around + // draw border GtkWidget *frame = gtk_frame_new (NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 2); - gtk_container_add (GTK_CONTAINER (frame), box); - box = frame; -#endif -#if 0 // draw border only to the left - GtkWidget *frame_box = gtk_hbox_new (FALSE, 2); - gtk_box_pack_start (GTK_BOX (frame_box), gtk_vseparator_new(), FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (frame_box), box, TRUE, TRUE, 0); - box = frame_box; -#endif -#if 0 // colored background - GtkWidget *back = gtk_event_box_new(); - GdkColor color = { 0, 230 << 8, 230 << 8, 230 << 8 }; - gtk_widget_modify_bg (back, GTK_STATE_NORMAL, &color); - gtk_container_add (GTK_CONTAINER (back), box); - box = back; -#endif - - setChild (box); + gtk_container_add (GTK_CONTAINER (frame), versions_box); + setChild (frame); } - void clearVersions() - { - GList *children = gtk_container_get_children (GTK_CONTAINER (versions_box)); - for (GList *i = children; i; i = i->next) - gtk_container_remove (GTK_CONTAINER (versions_box), (GtkWidget *) i->data); - g_list_free (children); - versions.clear(); - } - -#ifdef ATRI_BUTTONS -static void atri_button_clicked_cb (GtkToggleButton *button, VersionExpander *pThis) -{ - BusyOp op; - Ypp::Selectable sel = pThis->list.get (0); - - if (!gtk_toggle_button_get_active (button)) { /* was active before pressing? */ - sel.undo(); - return; - } - - int nb = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "nb")); - std::list <Ypp::Version>::iterator it = pThis->versions.begin(); - for (int i = 0; i < nb; i++) it++; - - // guard with startTransaction() ... - - if (sel.toModify()) - sel.undo(); - - Ypp::Version &version = *it; - if (version.isInstalled()) - sel.remove(); - else { - sel.setCandidate (version); - sel.install(); - } -} -#endif - GtkWidget *addVersion (Ypp::Selectable &sel, Ypp::Version version, GtkWidget *group) { - GtkWidget *widget; -#ifdef ATRI_BUTTONS - GtkWidget *hbox = gtk_hbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 2); GtkWidget *button = gtk_toggle_button_new(); gtk_container_add (GTK_CONTAINER (button), gtk_image_new()); + GtkWidget *label = gtk_label_new (""); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + + GtkWidget *hbox = gtk_hbox_new (FALSE, 6); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 2); gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0); - updateRadio (hbox, sel, version); - widget = hbox; + gtk_widget_show_all (hbox); + g_object_set_data (G_OBJECT (button), "nb", GINT_TO_POINTER (versions.size())); - g_signal_connect (G_OBJECT (button), "toggled", G_CALLBACK (atri_button_clicked_cb), this); -#else - GtkWidget *radio = gtk_radio_button_new_with_label_from_widget - (GTK_RADIO_BUTTON (group), ""); - updateRadio (radio, sel, version); - - if (version.toModify()) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); - g_signal_connect (G_OBJECT (radio), "toggled", - G_CALLBACK (version_toggled_cb), this); - widget = radio; -#endif + updateVersionWidget (hbox, sel, version); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (button_clicked_cb), this); + + GtkWidget *widget = hbox; if ((versions.size() % 2) == 1) g_signal_connect (G_OBJECT (widget), "expose-event", G_CALLBACK (draw_gray_cb), NULL); versions.push_back (version); gtk_box_pack_start (GTK_BOX (versions_box), widget, FALSE, TRUE, 0); - return widget; } - void updateRadio (GtkWidget *radio, Ypp::Selectable &sel, Ypp::Version &version) + void updateVersionLabel (GtkWidget *label, Ypp::Selectable &sel, Ypp::Version &version) { - bool modified; - std::string repo; + std::string repo; bool modified; if (version.isInstalled()) { repo = _("Installed"); modified = sel.toRemove(); @@ -511,93 +414,154 @@ } modified = modified && version.toModify(); - std::string number (version.number()); - std::string arch (version.arch()); + std::string number (version.number()), arch (version.arch()); char *tooltip = g_strdup_printf ("%s (%s)\n%s", number.c_str(), arch.c_str(), repo.c_str()); number = YGUtils::truncate (number, 20, 0); - char *label = g_strdup_printf ("%s%s (%s)\n%s%s", + char *str = g_strdup_printf ("%s%s (%s)\n%s%s", modified ? "" : "", number.c_str(), arch.c_str(), repo.c_str(), modified ? "" : ""); -#ifdef ATRI_BUTTONS - GList *children = gtk_container_get_children (GTK_CONTAINER (radio)); - GtkWidget *_label = (GtkWidget *) children->data; - GtkWidget *_button = (GtkWidget *) children->next->data; - gtk_label_set_markup (GTK_LABEL (_label), label); + gtk_label_set_markup (GTK_LABEL (label), str); if (number.size() > 20) - gtk_widget_set_tooltip_markup (_label, tooltip); - g_list_free (children); + gtk_widget_set_tooltip_markup (label, tooltip); + g_free (tooltip); g_free (str); + } - const gchar *stock, *l; - bool can_never_modify; + void updateVersionButton (GtkWidget *button, Ypp::Selectable &sel, Ypp::Version &version) + { + const char *stock, *tooltip; + bool modified, can_modify = true; if (version.isInstalled()) { - l = _("Remove"); + tooltip = _("Remove"); stock = GTK_STOCK_DELETE; - can_never_modify = !sel.canRemove(); + can_modify = sel.canRemove(); modified = sel.toRemove(); } else { if (sel.hasInstalledVersion()) { Ypp::Version installed = sel.installed(); if (installed < version) { - l = _("Upgrade"); + tooltip = _("Upgrade"); stock = GTK_STOCK_GO_UP; } else if (installed > version) { - l = _("Downgrade"); + tooltip = _("Downgrade"); stock = GTK_STOCK_GO_DOWN; } else { - l = _("Re-install"); + tooltip = _("Re-install"); stock = GTK_STOCK_REFRESH; } } else { - l = _("Install"); + tooltip = _("Install"); stock = GTK_STOCK_SAVE; } modified = sel.toInstall(); } if (modified) - l = _("Undo"); - bool can_modify = !sel.isLocked(); - modified = modified && version.toModify(); + tooltip = _("Undo"); -g_signal_handlers_block_by_func (_button, (gpointer) atri_button_clicked_cb, this); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_button), modified); -g_signal_handlers_unblock_by_func (_button, (gpointer) atri_button_clicked_cb, this); - gtk_widget_set_sensitive (_button, can_modify); -/* if (can_never_modify) - gtk_widget_hide (_button); - else - gtk_widget_show (_button); -*/ - // stock is never changed -- could be set previously... - gtk_widget_set_tooltip_text (_button, l); - gtk_image_set_from_stock (GTK_IMAGE (GTK_BIN(_button)->child), stock, GTK_ICON_SIZE_BUTTON); + g_signal_handlers_block_by_func (button, (gpointer) button_clicked_cb, this); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), modified); + g_signal_handlers_unblock_by_func (button, (gpointer) button_clicked_cb, this); + can_modify ? gtk_widget_show (button) : gtk_widget_hide (button); + gtk_widget_set_tooltip_text (button, tooltip); + gtk_image_set_from_stock (GTK_IMAGE (gtk_bin_get_child (GTK_BIN(button))), + stock, GTK_ICON_SIZE_BUTTON); + } + + void updateVersionWidget (GtkWidget *widget, Ypp::Selectable &sel, Ypp::Version &version) + { + GList *children = gtk_container_get_children (GTK_CONTAINER (widget)); + GtkWidget *label = (GtkWidget *) children->data; + GtkWidget *button = (GtkWidget *) children->next->data; + g_list_free (children); -#else - gtk_label_set_markup (GTK_LABEL (GTK_BIN (radio)->child), label); - if (number.size() > 20) - gtk_widget_set_tooltip_markup (radio, tooltip); -#endif + updateVersionLabel (label, sel, version); + updateVersionButton (button, sel, version); + } + + void updateMultiselectionButton (GtkWidget *button) + { + Ypp::ListProps props (list); + + const char *stock, *tooltip; + bool modified, hide = false; + if (props.isInstalled()) { + tooltip = _("Remove"); + stock = GTK_STOCK_DELETE; + } + else if (props.isNotInstalled()) { + tooltip = _("Install"); + stock = GTK_STOCK_SAVE; + } + else + hide = true; + modified = props.toModify(); + if (modified) + tooltip = _("Undo"); - g_free (tooltip); - g_free (label); + g_signal_handlers_block_by_func (button, (gpointer) button_clicked_cb, this); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), modified); + g_signal_handlers_unblock_by_func (button, (gpointer) button_clicked_cb, this); + hide ? gtk_widget_hide (button) : gtk_widget_show (button); + gtk_widget_set_tooltip_text (button, tooltip); + gtk_image_set_from_stock (GTK_IMAGE (gtk_bin_get_child (GTK_BIN(button))), + stock, GTK_ICON_SIZE_BUTTON); } - Ypp::Version &getSelected() + void clearVersions() { - std::list <Ypp::Version>::iterator it = versions.begin(); GList *children = gtk_container_get_children (GTK_CONTAINER (versions_box)); - for (GList *i = children; i; i = i->next, it++) - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (i->data))) - break; + for (GList *i = children; i; i = i->next) + gtk_container_remove (GTK_CONTAINER (versions_box), (GtkWidget *) i->data); g_list_free (children); + versions.clear(); + } + + Ypp::Version &getVersion (GtkToggleButton *button) + { + int nb = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "nb")); + std::list <Ypp::Version>::iterator it = versions.begin(); + for (int i = 0; i < nb; i++) it++; return *it; } + static void button_clicked_cb (GtkToggleButton *button, VersionExpander *pThis) + { + BusyOp op; + if (gtk_toggle_button_get_active (button)) { // was un-pressed + if (pThis->list.size() > 1) { + Ypp::ListProps props (pThis->list); + if (props.hasUpgrade()) + pThis->list.install(); + else if (props.isInstalled()) + pThis->list.remove(); + else if (props.isNotInstalled()) + pThis->list.install(); + else if (props.toModify()) + pThis->list.undo(); + } + else { + Ypp::Selectable sel = pThis->list.get (0); + Ypp::Version &version = pThis->getVersion (button); + + if (sel.toModify()) + sel.undo(); + if (version.isInstalled()) + sel.remove(); + else { + sel.setCandidate (version); + sel.install(); + } + } + } + else // button was pressed + pThis->list.undo(); + } + virtual bool onlySingleList() { return false; } virtual void showList (Ypp::List list) @@ -610,169 +574,46 @@ GtkWidget *radio = 0; for (int i = 0; i < sel.totalVersions(); i++) radio = addVersion (sel, sel.version (i), radio); - gtk_widget_show_all (versions_box); } + else { + GtkWidget *button = gtk_toggle_button_new(); + gtk_container_add (GTK_CONTAINER (button), gtk_image_new()); - // is locked - if (props.isLocked() || props.isUnlocked()) - gtk_widget_set_sensitive (button, !props.isLocked()); - else - gtk_widget_set_sensitive (button, TRUE); + GtkWidget *label = gtk_label_new (_("Several selected")); + GtkWidget *hbox = gtk_hbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (versions_box), hbox, FALSE, TRUE, 0); + gtk_widget_show_all (hbox); + + updateMultiselectionButton (button); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (button_clicked_cb), this); + } - updateButton(); + gtk_widget_set_sensitive (versions_box, !props.isLocked()); } virtual void showRefreshList (Ypp::List list) { - updateButton(); - // update radios + GList *children = gtk_container_get_children (GTK_CONTAINER (versions_box)); if (list.size() == 1) { Ypp::Selectable &sel = list.get (0); std::list <Ypp::Version>::iterator it = versions.begin(); - GList *children = gtk_container_get_children (GTK_CONTAINER (versions_box)); for (GList *i = children; i; i = i->next, it++) - updateRadio ((GtkWidget *) i->data, sel, *it); - g_list_free (children); - } - } - - void updateButton() - { -#ifdef ATRI_BUTTONS -if (list.size() == 1) { gtk_widget_hide (button); gtk_widget_hide (undo_button); return; } -#endif - - const char *label = 0, *stock = 0; - bool modified = false, can_modify = true, can_never_modify = false; - if (list.size() == 1) { - Ypp::Selectable sel = list.get (0); - Ypp::Version &version = getSelected(); - - if (version.isInstalled()) { - label = _("Remove"); - stock = GTK_STOCK_DELETE; - can_never_modify = !sel.canRemove(); - modified = sel.toRemove(); - } - else { - if (sel.hasInstalledVersion()) { - Ypp::Version installed = sel.installed(); - if (installed < version) { - label = _("Upgrade"); - stock = GTK_STOCK_GO_UP; - } - else if (installed > version) { - label = _("Downgrade"); - stock = GTK_STOCK_GO_DOWN; - } - else { - label = _("Re-install"); - stock = GTK_STOCK_REFRESH; - } - } - else { - label = _("Install"); - stock = GTK_STOCK_SAVE; - } - modified = sel.toInstall(); - } - can_modify = !sel.isLocked(); - modified = modified && version.toModify(); - } - else { - Ypp::ListProps props (list); - modified = props.toModify(); - if (props.hasUpgrade()) { - label = _("Upgrade"); - stock = GTK_STOCK_GO_UP; - } - else if (props.isInstalled()) { - label = _("Remove"); - stock = GTK_STOCK_DELETE; - can_never_modify = !props.canRemove(); - } - else if (props.isNotInstalled()) { - label = _("Install"); - stock = GTK_STOCK_SAVE; - } - else if (props.toModify()) { - label = _("Undo"); - stock = GTK_STOCK_UNDO; - modified = false; // don't show another undo button - } - can_modify = props.isUnlocked(); - } - - if (label) { - gtk_button_set_label (GTK_BUTTON (button), label); - GtkWidget *image = gtk_image_new_from_stock ( - stock, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (button), image); - gtk_widget_show (button); - } - else - gtk_widget_hide (button); - gtk_widget_set_sensitive (button, !modified && can_modify); - if (can_modify) - gtk_widget_set_tooltip_text (button, NULL); - else - gtk_widget_set_tooltip_text (button, _("Package is locked")); - !can_never_modify ? gtk_widget_show (button) : gtk_widget_hide (button); - modified ? gtk_widget_show (undo_button) : gtk_widget_hide (undo_button); - } - - static void version_toggled_cb (GtkToggleButton *button, VersionExpander *pThis) - { - if (gtk_toggle_button_get_active (button)) { - Ypp::Selectable sel = pThis->list.get (0); - Ypp::Version &version = pThis->getSelected(); - - // enclosing this within startTransactions() so the button is updated - // before signaling any change, for a snappy feel - Ypp::startTransactions(); - if (!sel.toInstall()) - sel.setCandidate (version); - - pThis->updateButton(); - while (g_main_context_iteration (NULL, FALSE)) ; - Ypp::finishTransactions(); - } - } - - static void button_clicked_cb (GtkButton *button, VersionExpander *pThis) - { - BusyOp op; - if (pThis->list.size() == 1) { - Ypp::Selectable sel = pThis->list.get (0); - Ypp::Version &version = pThis->getSelected(); - - if (version.isInstalled()) - sel.remove(); - else { - sel.setCandidate (version); - sel.install(); - } + updateVersionWidget ((GtkWidget *) i->data, sel, *it); } else { - Ypp::ListProps props (pThis->list); - if (props.hasUpgrade()) - pThis->list.install(); - else if (props.isInstalled()) - pThis->list.remove(); - else if (props.isNotInstalled()) - pThis->list.install(); - else if (props.toModify()) - pThis->list.undo(); + GtkWidget *hbox = (GtkWidget *) children->data; + GList *l = gtk_container_get_children (GTK_CONTAINER (hbox)); + GtkWidget *button = (GtkWidget *) l->next->data; + g_list_free (l); + updateMultiselectionButton (button); } + g_list_free (children); } - static void undo_clicked_cb (GtkButton *button, VersionExpander *pThis) - { BusyOp op; pThis->list.undo(); } - - static gboolean sel_modified_idle_cb (gpointer data) - { Ypp::runSolver(); return FALSE; } - static gboolean draw_gray_cb (GtkWidget *widget, GdkEventExpose *event) { GtkAllocation *alloc = &widget->allocation; Modified: trunk/gtk/src/pkg/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzyppwrapper.cc?rev=… ============================================================================== --- trunk/gtk/src/pkg/yzyppwrapper.cc (original) +++ trunk/gtk/src/pkg/yzyppwrapper.cc Thu Jan 20 21:22:05 2011 @@ -487,9 +487,7 @@ bool Ypp::Selectable::canRemove() { switch (m_type) { - case PACKAGE: - case LANGUAGE: - return true; + case PACKAGE: case LANGUAGE: return true; default: break; } return 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] r63245 - /tags/stable-2_20_8/ldap-client/
by jsuchome＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: jsuchome Date: Thu Jan 20 16:43:03 2011 New Revision: 63245 URL: http://svn.opensuse.org/viewcvs/yast?rev=63245&view=rev Log: Created tag stable-2_20_8 for ldap-client Added: tags/stable-2_20_8/ldap-client/ - copied from r63244, trunk/ldap-client/ -- 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] r63244 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp
by jsuchome＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: jsuchome Date: Thu Jan 20 16:42:56 2011 New Revision: 63244 URL: http://svn.opensuse.org/viewcvs/yast?rev=63244&view=rev Log: - write default_realm as realm - 2.20.8 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=63244&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Thu Jan 20 16:42:56 2011 @@ -1 +1 @@ -2.20.7 +2.20.8 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Thu Jan 20 16:42:56 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 20 16:41:00 CET 2011 - jsuchome(a)suse.cz + +- write default_realm as realm +- 2.20.8 + +------------------------------------------------------------------- Thu Jan 20 16:18:04 CET 2011 - jsuchome(a)suse.cz - remove pam_krb5 when sssd is configured (fate#308902) Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=632… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Thu Jan 20 16:42:56 2011 @@ -2067,7 +2067,7 @@ if (is (e,map) && e != $[]) { map kerberos = (map) e; - SCR::Write (add (domain, "krb5_realm"), kerberos["kerberos_client","default_domain"]:nil); + SCR::Write (add (domain, "krb5_realm"), kerberos["kerberos_client","default_realm"]:nil); SCR::Write (add (domain, "krb5_kdcip"), kerberos["kerberos_client","kdc_server"]:nil); } } -- 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] r63243 - in /trunk/packager: package/yast2-packager.changes src/modules/SourceDialogs.ycp
by mvidner＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: mvidner Date: Thu Jan 20 16:34:56 2011 New Revision: 63243 URL: http://svn.opensuse.org/viewcvs/yast?rev=63243&view=rev Log: Edit complete URL by default. Separate input boxes for the protocol, host name and directory path might have been intuitive in the 90's, when typing commands into the 'ftp program was a common way of retrieving files from the internet, but it is definitely not intuitive for most of today's users. Signed-off-by: Michal Marek <mmarek(a)suse.cz> Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SourceDialogs.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Jan 20 16:34:56 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 20 16:24:45 CET 2011 - mvidner(a)suse.cz + +- Edit complete URL by default (by Michal Marek) + +------------------------------------------------------------------- Mon Jan 3 14:15:53 UTC 2011 - lslezak(a)suse.cz - fixed partition evaluation (when thare are more than 10 Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Thu Jan 20 16:34:56 2011 @@ -1374,7 +1374,7 @@ // use selected editing URL part, remember the value in case the URL is wrong // and the dialog needs to displayed again -boolean editing_parts = true; +boolean editing_parts = false; /** * Handle function of a widget -- 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] r63242 - /tags/stable-2_20_7/ldap-client/
by jsuchome＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: jsuchome Date: Thu Jan 20 16:19:30 2011 New Revision: 63242 URL: http://svn.opensuse.org/viewcvs/yast?rev=63242&view=rev Log: Created tag stable-2_20_7 for ldap-client Added: tags/stable-2_20_7/ldap-client/ - copied from r63241, trunk/ldap-client/ -- 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] r63241 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp
by jsuchome＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: jsuchome Date: Thu Jan 20 16:19:21 2011 New Revision: 63241 URL: http://svn.opensuse.org/viewcvs/yast?rev=63241&view=rev Log: - remove pam_krb5 when sssd is configured (fate#308902) - 2.20.7 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=63241&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Thu Jan 20 16:19:21 2011 @@ -1 +1 @@ -2.20.6 +2.20.7 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Thu Jan 20 16:19:21 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 20 16:18:04 CET 2011 - jsuchome(a)suse.cz + +- remove pam_krb5 when sssd is configured (fate#308902) +- 2.20.7 + +------------------------------------------------------------------- Thu Jan 13 11:37:48 CET 2011 - jsuchome(a)suse.cz - pass certificate data to .ldap agent (bnc#662949) Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=632… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Thu Jan 20 16:19:21 2011 @@ -2049,6 +2049,7 @@ // In a mixed Kerberos/LDAP setup the following changes are needed in the [domain/default] section: if (Pam::Enabled("krb5")) { +// FIXME: do not test for pam, it may be already off... SCR::Write (add (domain, "auth_provider"), "krb5"); SCR::Write (add (domain, "chpass_provider"), "krb5"); /* @@ -2066,7 +2067,6 @@ if (is (e,map) && e != $[]) { map kerberos = (map) e; -y2internal ("kerberos export map: %1", kerberos); SCR::Write (add (domain, "krb5_realm"), kerberos["kerberos_client","default_domain"]:nil); SCR::Write (add (domain, "krb5_kdcip"), kerberos["kerberos_client","kdc_server"]:nil); } @@ -2581,6 +2581,11 @@ union (nsswitch["passwd"]:[], ["sss"])); Nsswitch::WriteDb ("group", (list<string>) union (nsswitch["group"]:[], ["sss"])); + if (Pam::Enabled("krb5")) + { + y2milestone ("configuring 'sss', so 'krb5' will be removed"); + Pam::Remove ("krb5"); + } } else { -- 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] r63240 - /tags/stable-2_20_1/kerberos-client/
by jsuchome＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: jsuchome Date: Thu Jan 20 16:13:42 2011 New Revision: 63240 URL: http://svn.opensuse.org/viewcvs/yast?rev=63240&view=rev Log: Created tag stable-2_20_1 for kerberos-client Added: tags/stable-2_20_1/kerberos-client/ - copied from r63239, trunk/kerberos-client/ -- 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] r63239 - in /trunk/kerberos-client: VERSION package/yast2-kerberos-client.changes src/Kerberos.ycp testsuite/tests/Write.out
by jsuchome＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: jsuchome Date: Thu Jan 20 16:13:34 2011 New Revision: 63239 URL: http://svn.opensuse.org/viewcvs/yast?rev=63239&view=rev Log: - do not use pam_krb5 when sssd is configured - 2.20.1 Modified: trunk/kerberos-client/VERSION trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/Kerberos.ycp trunk/kerberos-client/testsuite/tests/Write.out Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=6323… ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Thu Jan 20 16:13:34 2011 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-ke… ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Thu Jan 20 16:13:34 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 20 16:12:22 CET 2011 - jsuchome(a)suse.cz + +- do not use pam_krb5 when sssd is configured +- 2.20.1 + +------------------------------------------------------------------- Fri Aug 6 11:05:12 CEST 2010 - jsuchome(a)suse.cz - testsuite adapted to changes in yast2-pam Modified: trunk/kerberos-client/src/Kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/Kerberos.ycp… ============================================================================== --- trunk/kerberos-client/src/Kerberos.ycp (original) +++ trunk/kerberos-client/src/Kerberos.ycp Thu Jan 20 16:13:34 2011 @@ -482,7 +482,12 @@ // -- pam settings if (pam_modified || write_only) { - if (use_pam_krb) + if (Pam::Enabled ("sss")) + { + y2milestone ("not using pam_krb5 because sssd is configured"); + Pam::Remove ("krb5"); + } + else if (use_pam_krb) { Pam::Add ("krb5"); // If ldap is configured we need to change it to ldap-account_only Modified: trunk/kerberos-client/testsuite/tests/Write.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/testsuite/tests/… ============================================================================== --- trunk/kerberos-client/testsuite/tests/Write.out (original) +++ trunk/kerberos-client/testsuite/tests/Write.out Thu Jan 20 16:13:34 2011 @@ -1,6 +1,7 @@ Dump ==== writing without any changes ================================= Return true Dump ==== pam enabled with krb5-ignore_unknown_principals= +Execute .target.bash_output "/usr/sbin/pam-config -q --sss" $["stdout":""] Execute .target.bash_output "/usr/sbin/pam-config -a --krb5" $["stdout":""] Execute .target.bash_output "/usr/sbin/pam-config -q --ldap" $["stdout":""] Execute .target.bash_output "/usr/sbin/pam-config -a --krb5-ignore_unknown_principals" $["stdout":""] @@ -11,6 +12,7 @@ Write .etc.ssh.ssh_config nil true Return true Dump ==== kerberos disabled, ssh support disabled, krb5.conf untouched= +Execute .target.bash_output "/usr/sbin/pam-config -q --sss" $["stdout":""] Execute .target.bash_output "/usr/sbin/pam-config -q --ldap-account_only" $["stdout":""] Execute .target.bash_output "/usr/sbin/pam-config -d --krb5" $["stdout":""] Write .etc.ssh.ssh_config.v."*"."GSSAPIAuthentication" "no" true -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63238 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/online_update.ycp
by jsuchome＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: jsuchome Date: Thu Jan 20 14:46:10 2011 New Revision: 63238 URL: http://svn.opensuse.org/viewcvs/yast?rev=63238&view=rev Log: - run repositories module for adding update source (bnc#658711) - 2.20.2 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/online_update.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=63238&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Thu Jan 20 14:46:10 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Thu Jan 20 14:46:10 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 20 14:43:08 CET 2011 - jsuchome(a)suse.cz + +- run repositories module for adding update source (bnc#658711) +- 2.20.2 + +------------------------------------------------------------------- Tue Nov 2 14:52:22 UTC 2010 - lslezak(a)suse.cz - updated to match the changed StartPackage callback signature Modified: trunk/online-update/src/online_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/online_update.… ============================================================================== --- trunk/online-update/src/online_update.ycp (original) +++ trunk/online-update/src/online_update.ycp Thu Jan 20 14:46:10 2011 @@ -19,6 +19,7 @@ import "OnlineUpdateCallbacks"; import "PackageLock"; import "Popup"; + import "Product"; import "Progress"; import "SourceManager"; import "URL"; @@ -108,9 +109,12 @@ if (!is_available && Popup::YesNo (_("No update repository configured yet. Run configuration workflow now?"))) { - // inst_suse_register is still able to configure update repo, - // however this will change in future (see bnc#565094) - any res = WFM::CallFunction ("inst_suse_register", []); + // inst_suse_register is able to configure update repo for SLE, + // for openSUSE, let's use repository manager + string client = "inst_suse_register"; + if (Product::short_name == "openSUSE") + client = "repositories"; + any res = WFM::CallFunction (client, []); if (res != `next && res != `finish) { Wizard::CloseDialog(); -- 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] r63237 - /tags/stable-2_20_4/installation/
by jsrain＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: jsrain Date: Thu Jan 20 14:22:13 2011 New Revision: 63237 URL: http://svn.opensuse.org/viewcvs/yast?rev=63237&view=rev Log: Created tag stable-2_20_4 for installation Added: tags/stable-2_20_4/installation/ - copied from r63236, trunk/installation/ -- 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] r63236 - in /trunk/installation: VERSION package/yast2-installation.changes src/include/inst_inc_second.ycp
by jsrain＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: jsrain Date: Thu Jan 20 14:21:24 2011 New Revision: 63236 URL: http://svn.opensuse.org/viewcvs/yast?rev=63236&view=rev Log: fix initialization of AutoUpgrade for 2nd stage Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/include/inst_inc_second.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=63236&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Jan 20 14:21:24 2011 @@ -1 +1 @@ -2.20.3 +2.20.4 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Jan 20 14:21:24 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 20 14:18:41 CET 2011 - jsrain(a)suse.cz + +- fix initialization of AutoUpgrade for 2nd stage +- 2.20.4 + +------------------------------------------------------------------- Wed Jan 19 15:38:20 CET 2011 - jsrain(a)suse.cz - adaptations for unattended migration (fate#310481) Modified: trunk/installation/src/include/inst_inc_second.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_in… ============================================================================== --- trunk/installation/src/include/inst_inc_second.ycp (original) +++ trunk/installation/src/include/inst_inc_second.ycp Thu Jan 20 14:21:24 2011 @@ -455,13 +455,15 @@ } void SetSecondStageInstallation () { - // Detect mode early to be able to setup steps correctly - if (FileUtils::Exists (Installation::destdir + Installation::file_update_mode)) { - Mode::SetMode ("update"); - } - else if (FileUtils::Exists (Installation::destdir + Installation::file_live_install_mode)) { - Mode::SetMode ("live_installation"); - } + if (! Mode::autoupgrade()) { + // Detect mode early to be able to setup steps correctly + if (FileUtils::Exists (Installation::destdir + Installation::file_update_mode)) { + Mode::SetMode ("update"); + } + else if (FileUtils::Exists (Installation::destdir + Installation::file_live_install_mode)) { + Mode::SetMode ("live_installation"); + } + } SetXENExceptions(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0