October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41302 - in /trunk/live-installer: package/yast2-live-installer.changes src/control/live-install.xml
by jsrain＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: jsrain Date: Wed Oct 10 11:33:20 2007 New Revision: 41302 URL: http://svn.opensuse.org/viewcvs/yast?rev=41302&view=rev Log: added registration to the live installation workflow (#325560) Modified: trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/control/live-install.xml Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-liv… ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Wed Oct 10 11:33:20 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 10 10:29:13 CEST 2007 - jsrain(a)suse.cz + +- added registration to the live installation workflow (#325560) + +------------------------------------------------------------------- Thu Oct 4 14:26:12 CEST 2007 - locilka(a)suse.cz - Adding missing live_save_config_finish script (#310517). Modified: trunk/live-installer/src/control/live-install.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/control/live-… ============================================================================== --- trunk/live-installer/src/control/live-install.xml (original) +++ trunk/live-installer/src/control/live-install.xml Wed Oct 10 11:33:20 2007 @@ -216,19 +216,23 @@ <name>user</name> </module> <module> - <label>Online Update</label> + <label>Registration</label> <name>inst_live_prepare_net_test</name> </module> <module> - <label>Online Update</label> + <label>Registration</label> <name>inst_do_net_test</name> </module>  + <module> + <label>Registration</label> + <name>inst_suse_register</name> + </module> <module> <label>Online Update</label> <name>ask_online_update</name> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41301 - /tags/stable-2_16_2/network/
by kmachalkova＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: kmachalkova Date: Wed Oct 10 10:42:11 2007 New Revision: 41301 URL: http://svn.opensuse.org/viewcvs/yast?rev=41301&view=rev Log: Created tag stable-2_16_2 for network Added: tags/stable-2_16_2/network/ - copied from r41300, trunk/network/ -- 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] r41300 - /tags/stable-2_16_2/
by kmachalkova＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: kmachalkova Date: Wed Oct 10 10:42:07 2007 New Revision: 41300 URL: http://svn.opensuse.org/viewcvs/yast?rev=41300&view=rev Log: Created tag stable-2_16_2 Added: tags/stable-2_16_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] r41299 - in /trunk/network: VERSION package/yast2-network.changes src/modules/Proxy.ycp
by kmachalkova＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: kmachalkova Date: Wed Oct 10 10:41:59 2007 New Revision: 41299 URL: http://svn.opensuse.org/viewcvs/yast?rev=41299&view=rev Log: Escape backslashes in username also in .curlrc (#331038) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Proxy.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=41299&r1=412… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Oct 10 10:41:59 2007 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Oct 10 10:41:59 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 10 10:39:47 CEST 2007 - kmachalkova(a)suse.cz + +- Escape backslashes in usernames also in .curlrc (#331038) +- 2.16.2 + +------------------------------------------------------------------- Wed Oct 3 09:57:51 CEST 2007 - mvidner(a)suse.cz - Do not try to package COPYRIGHT.english, it is gone from Modified: trunk/network/src/modules/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Proxy.ycp?re… ============================================================================== --- trunk/network/src/modules/Proxy.ycp (original) +++ trunk/network/src/modules/Proxy.ycp Wed Oct 10 10:41:59 2007 @@ -79,8 +79,14 @@ pass = regexpsub(user, "^.*:(.*)$", "\\1"); user = regexpsub(user, "^(.*):.*$", "\\1"); } + if(pass == nil) pass = ""; - if(user == nil) user = ""; + if(user == nil) + user = ""; + else { + if ( regexpmatch(user, "^.*\\\\.*$")) + user = regexpsub(user, "^(.*)\\\\(.*)$", "\\1\\2"); + } /* Read /root/.wgetrc */ /* YOU uses curl(1) @@ -132,6 +138,8 @@ /* Update /root/.curlrc */ string proxyuser = nil; if (user != "") { + //Escape backslash characters in .curlrc (#331038) + user = mergestring (splitstring(user, "\\"), "\\\\"); proxyuser = user; if (pass != "") proxyuser = user + ":" + pass; } -- 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] r41298 - in /branches/SuSE-Linux-10_3-Branch/live-installer: package/yast2-live-installer.changes src/control/live-install.xml
by jsrain＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: jsrain Date: Wed Oct 10 10:30:40 2007 New Revision: 41298 URL: http://svn.opensuse.org/viewcvs/yast?rev=41298&view=rev Log: added registration to the live installation workflow (#325560) Modified: branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes branches/SuSE-Linux-10_3-Branch/live-installer/src/control/live-install.xml Modified: branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/live-i… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes (original) +++ branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes Wed Oct 10 10:30:40 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 10 10:29:13 CEST 2007 - jsrain(a)suse.cz + +- added registration to the live installation workflow (#325560) + +------------------------------------------------------------------- Thu Oct 4 14:26:12 CEST 2007 - locilka(a)suse.cz - Adding missing live_save_config_finish script (#310517). Modified: branches/SuSE-Linux-10_3-Branch/live-installer/src/control/live-install.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/live-i… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/live-installer/src/control/live-install.xml (original) +++ branches/SuSE-Linux-10_3-Branch/live-installer/src/control/live-install.xml Wed Oct 10 10:30:40 2007 @@ -216,11 +216,11 @@ <name>user</name> </module> <module> - <label>Online Update</label> + <label>Registration</label> <name>inst_live_prepare_net_test</name> </module> <module> - <label>Online Update</label> + <label>Registration</label> <name>inst_do_net_test</name> </module>  + <module> + <label>Registration</label> + <name>inst_suse_register</name> + </module> <module> <label>Online Update</label> <name>ask_online_update</name> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41297 - /tags/stable-2_16_0/ca-management/
by mcalmer＠svn.opensuse.org 09 Oct '07

09 Oct '07

Author: mcalmer Date: Tue Oct 9 18:04:05 2007 New Revision: 41297 URL: http://svn.opensuse.org/viewcvs/yast?rev=41297&view=rev Log: Created tag stable-2_16_0 for ca-management Added: tags/stable-2_16_0/ca-management/ - copied from r41296, trunk/ca-management/ -- 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] r41296 - in /trunk/ca-management: VERSION package/yast2-ca-management.changes yast2-ca-management.spec.in
by mcalmer＠svn.opensuse.org 09 Oct '07

09 Oct '07

Author: mcalmer Date: Tue Oct 9 17:59:50 2007 New Revision: 41296 URL: http://svn.opensuse.org/viewcvs/yast?rev=41296&view=rev Log: version 2.16.0 Modified: trunk/ca-management/VERSION trunk/ca-management/package/yast2-ca-management.changes trunk/ca-management/yast2-ca-management.spec.in Modified: trunk/ca-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/VERSION?rev=41296&… ============================================================================== --- trunk/ca-management/VERSION (original) +++ trunk/ca-management/VERSION Tue Oct 9 17:59:50 2007 @@ -1 +1 @@ -2.15.2 +2.16.0 Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-m… ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Tue Oct 9 17:59:50 2007 @@ -1,7 +1,10 @@ ------------------------------------------------------------------- Mon Oct 8 12:20:38 CEST 2007 - mc(a)suse.de +- version 2.16.0 - fix addRequest call. [#326465] +- implement support for MS-UPN and Krb5PrincipalName in + SubjectAlternativeName Extension ------------------------------------------------------------------- Tue Aug 14 13:38:04 CEST 2007 - jsuchome(a)suse.cz Modified: trunk/ca-management/yast2-ca-management.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/yast2-ca-managemen… ============================================================================== --- trunk/ca-management/yast2-ca-management.spec.in (original) +++ trunk/ca-management/yast2-ca-management.spec.in Tue Oct 9 17:59:50 2007 @@ -2,7 +2,8 @@ @HEADER@ BuildRequires: dosfstools limal-ca-mgm-perl limal-perl perl-Date-Calc perl-URI perl-X500-DN docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer yast2-devtools pkg-config yast2-core yast2 update-desktop-files -Requires: yast2 perl perl-gettext yast2-perl-bindings perl-X500-DN perl-Date-Calc limal-ca-mgm-perl limal-perl perl-Config-IniFiles perl-URI +Requires: yast2 perl perl-gettext yast2-perl-bindings perl-X500-DN perl-Date-Calc limal-perl perl-Config-IniFiles perl-URI +Requires: limal-ca-mgm-perl >= 1.4.0 BuildArchitectures: noarch -- 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] r41295 - in /branches/tmp/sh/mod-ui: core/libyui/src/ qt/src/
by sh-sh-sh＠svn.opensuse.org 09 Oct '07

09 Oct '07

Author: sh-sh-sh Date: Tue Oct 9 16:28:19 2007 New Revision: 41295 URL: http://svn.opensuse.org/viewcvs/yast?rev=41295&view=rev Log: ported LogView Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc branches/tmp/sh/mod-ui/core/libyui/src/YLogView.cc branches/tmp/sh/mod-ui/core/libyui/src/YLogView.h branches/tmp/sh/mod-ui/core/libyui/src/YUI.h branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h branches/tmp/sh/mod-ui/qt/src/YQLogView.cc branches/tmp/sh/mod-ui/qt/src/YQLogView.h branches/tmp/sh/mod-ui/qt/src/YQUI.h branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog Tue Oct 9 16:28:19 2007 @@ -362,4 +362,10 @@ - Tree - Table -* Ported IntField \ No newline at end of file +* Ported IntField + + +2007-10-09 17:00 sh(a)suse.de + +* Ported LogView + Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc Tue Oct 9 16:28:19 2007 @@ -54,6 +54,7 @@ #include "YInputField.h" #include "YIntField.h" #include "YLabel.h" +#include "YLogView.h" #include "YLayoutBox.h" #include "YMenuButton.h" #include "YMultiLineEdit.h" @@ -1149,11 +1150,11 @@ rejectAllOptions( term,optList ); - YCPString label = term->value( argnr )->asString(); - int visibleLines = term->value( argnr+1 )->asInteger()->value(); - int maxLines = term->value( argnr+2 )->asInteger()->value(); + string label = term->value( argnr )->asString()->value(); + int visibleLines = term->value( argnr+1 )->asInteger()->value(); + int maxLines = term->value( argnr+2 )->asInteger()->value(); - return YUI::ui()->createLogView( parent, opt, label, visibleLines, maxLines ); + return YUI::widgetFactory()->createLogView( parent, label, visibleLines, maxLines ); } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YLogView.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YLogView.cc Tue Oct 9 16:28:19 2007 @@ -6,19 +6,18 @@ | | | (_| |___) || | / __/ | | |_|\__,_|____/ |_| |_____| | | | -| core system | +| core system | | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: YLogView.cc + File: YLogView.cc - Author: Stefan Hundhammer <sh(a)suse.de> + Author: Stefan Hundhammer <sh(a)suse.de> /-*/ +#include <deque> -#include <ycp/YCPSymbol.h> -#include <ycp/YCPBoolean.h> #define y2log_component "ui" #include <ycp/y2log.h> @@ -26,158 +25,257 @@ #include "YLogView.h" -YLogView::YLogView( const YWidgetOpt & opt, const YCPString & label, int visibleLines, int maxLines ) - : YWidget( opt ) - , _label( label ) - , _visibleLines( visibleLines ) - , _maxLines( maxLines ) +typedef std::deque<string> StringDeque; +typedef std::deque<string>::iterator StringDequeIterator; +typedef std::deque<string>::const_iterator StringDequeConstIterator; + + + +struct YLogViewPrivate +{ + YLogViewPrivate( const string & label, int visibleLines, int maxLines ) + : label( label ) + , visibleLines( visibleLines ) + , maxLines( maxLines ) + {} + + string label; + int visibleLines; + int maxLines; + + StringDeque logText; +}; + + + + +YLogView::YLogView( YWidget * parent, const string & label, int visibleLines, int maxLines ) + : YWidget( parent ) + , priv( new YLogViewPrivate( label, visibleLines, maxLines ) ) { + YUI_CHECK_NEW( priv ); + setDefaultStretchable( YD_HORIZ, true ); setDefaultStretchable( YD_VERT, true ); } -void YLogView::setLabel( const YCPString & newLabel ) +YLogView::~YLogView() { - _label = newLabel; + // NOP } -void YLogView::clearText() +string +YLogView::label() const { - _logText.clear(); + return priv->label; } -void YLogView::appendText( const YCPString & newText ) +void +YLogView::setLabel( const string & label ) { - string text = newText->value(); - string::size_type from = 0; - string::size_type to = 0; + priv->label = label; +} - // Split the text into single lines +int +YLogView::visibleLines() const +{ + return priv->visibleLines; +} - while ( to < text.size() ) - { - from = to; - to = text.find( '\n', from ); - if ( to == string::npos ) // no more newline - to = text.size(); - else - to++; // include the newline - // Output one single line - appendLine( text.substr( from, to - from ) ); - } +void +YLogView::setVisibleLines( int newVisibleLines ) +{ + priv->visibleLines = newVisibleLines; +} - if ( to < text.size() ) // anything left over? - { - // Output the rest - appendLine( text.substr( to, text.size() - to ) ); - } - setLogText( YCPString( logText() ) );// pass the entire text to the specific UI's widget +int +YLogView::maxLines() const +{ + return priv->maxLines; } -void YLogView::appendLine( const string & line ) +void +YLogView::setMaxLines( int newMaxLines ) { - _logText.push_back( line ); + int linesToDelete = priv->maxLines - newMaxLines; + priv->maxLines = newMaxLines; - if ( maxLines() > 0 && _logText.size() > ( unsigned ) maxLines() ) - { - _logText.pop_front(); - } + for ( int i=0; i < linesToDelete; i++ ) + priv->logText.pop_front(); + + if ( linesToDelete > 0 ) + updateDisplay(); } -string YLogView::logText() +string +YLogView::logText() const { string text; - for ( unsigned i=0; i < _logText.size(); i++ ) + for ( StringDequeConstIterator it = priv->logText.begin(); + it != priv->logText.end(); + ++it ) { - text += _logText[i]; + text += *it; + } + + if ( ! text.empty() ) + { + // Cut off last newline + + if ( *(text.rbegin()) == '\n' ) // Last char is a newline? + { + text.resize( text.size() - 1 ); // make one char shorter + } } return text; } +string +YLogView::lastLine() const +{ + if ( priv->logText.empty() ) + return ""; + else + return priv->logText.back(); +} + -YCPValue YLogView::changeWidget( const YCPSymbol & property, const YCPValue & newValue ) +void +YLogView::appendLines( const string & newText ) { - string s = property->symbol(); + string text = newText; + string::size_type from = 0; + string::size_type to = 0; + + + // Split the text into single lines - /** - * @property string Value - * All log lines. Set this property to replace or clear the entire contents. - * Can only be set, not queried. - */ - if ( s == YUIProperty_Value ) + while ( to < text.size() ) { - if ( newValue->isString() ) - { - clearText(); - appendText( newValue->asString() ); - return YCPBoolean( true ); - } - else - { - y2error( "LogView: Invalid Value property - string expected, not %s", - newValue->toString().c_str() ); + from = to; + to = text.find( '\n', from ); + if ( to == string::npos ) // no more newline + to = text.size(); + else + to++; // include the newline - return YCPBoolean( false ); - } + // Output one single line + appendLine( text.substr( from, to - from ) ); } - /** - * @property string LastLine - * The last log line. Set this property to append one or more line(s) to the log. - * Can only be set, not queried. - */ - if ( s == YUIProperty_LastLine ) - { - if ( newValue->isString() ) - { - appendText( newValue->asString() ); - return YCPBoolean( true ); - } - else - { - y2error( "LogView: Invalid LastLine property - string expected, not %s", - newValue->toString().c_str() ); - return YCPBoolean( false ); - } + if ( to < text.size() ) // anything left over? + { + // Output the rest + appendLine( text.substr( to, text.size() - to ) ); } - /** - * @property string Label The label above the log text. - */ - else if ( s == YUIProperty_Label ) + + updateDisplay(); +} + + +void +YLogView::appendLine( const string & line ) +{ + priv->logText.push_back( line ); + + if ( maxLines() > 0 && priv->logText.size() > (unsigned) maxLines() ) { - if ( newValue->isString() ) - { - setLabel( newValue->asString() ); - return YCPBoolean( true ); - } - else - { - y2error( "LogView: Invalid Label property - string expected, not %s", - newValue->toString().c_str() ); + priv->logText.pop_front(); + } +} - return YCPBoolean( false ); - } + +void +YLogView::clearText() +{ + priv->logText.clear(); + updateDisplay(); +} + + +int YLogView::lines() const +{ + return priv->logText.size(); +} + + +void +YLogView::updateDisplay() +{ + displayLogText( logText() ); +} + + + +const YPropertySet & +YLogView::propertySet() +{ + static YPropertySet propSet; + + if ( propSet.isEmpty() ) + { + /* + * @property string Value All log lines. + * @property string LastLine The last log line(s). Use this to append lines. + * @property integer VisibleLines Number of lines to display. Call RecalcLayout() afterwards. + * @property integer MaxLines Number of lines to store (0 for all). + * @property string Label Caption above the log text + */ + propSet.add( YProperty( YUIProperty_Value, YStringProperty ) ); + propSet.add( YProperty( YUIProperty_LastLine, YStringProperty ) ); + propSet.add( YProperty( YUIProperty_VisibleLines, YIntegerProperty ) ); + propSet.add( YProperty( YUIProperty_MaxLines, YIntegerProperty ) ); + propSet.add( YProperty( YUIProperty_Label, YStringProperty ) ); + propSet.add( YWidget::propertySet() ); } - else return YWidget::changeWidget( property, newValue ); + + return propSet; } +bool +YLogView::setProperty( const string & propertyName, const YPropertyValue & val ) +{ + propertySet().check( propertyName, val.type() ); // throws exceptions if not found or type mismatch + + if ( propertyName == YUIProperty_Value ) setLogText ( val.stringVal() ); + else if ( propertyName == YUIProperty_LastLine ) appendLines ( val.stringVal() ); + else if ( propertyName == YUIProperty_VisibleLines ) setVisibleLines ( val.integerVal() ); + else if ( propertyName == YUIProperty_MaxLines ) setMaxLines ( val.integerVal() ); + else if ( propertyName == YUIProperty_Label ) setLabel ( val.stringVal() ); + else + { + return YWidget::setProperty( propertyName, val ); + } -YCPValue YLogView::queryWidget( const YCPSymbol & property ) + return true; // success -- no special processing necessary +} + + +YPropertyValue +YLogView::getProperty( const string & propertyName ) { - string s = property->symbol(); - if ( s == YUIProperty_Label ) return label(); - else return YWidget::queryWidget( property ); + propertySet().check( propertyName ); // throws exceptions if not found + + if ( propertyName == YUIProperty_Value ) return YPropertyValue( logText() ); + if ( propertyName == YUIProperty_LastLine ) return YPropertyValue( lastLine() ); + if ( propertyName == YUIProperty_VisibleLines ) return YPropertyValue( visibleLines() ); + if ( propertyName == YUIProperty_MaxLines ) return YPropertyValue( maxLines() ); + else if ( propertyName == YUIProperty_Label ) return YPropertyValue( label() ); + else + { + return YWidget::getProperty( propertyName ); + } } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YLogView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YLogView.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YLogView.h Tue Oct 9 16:28:19 2007 @@ -20,103 +20,157 @@ #define YLogView_h #include "YWidget.h" -#include <ycp/YCPString.h> -#include <deque> -using std::deque; +class YLogViewPrivate; +/** + * LogView: A scrollable (output-only) text to display a growing log, + * very much like the "tail -f" shell command. + **/ class YLogView : public YWidget { protected: /** * Constructor. - **/ - YLogView( const YWidgetOpt & opt, - const YCPString & label, - int visibleLines, - int maxLines ); + * + * 'label' is the caption above the log. 'visibleLines' indicates how many + * lines should be visible by default (unless changed by other layout + * constraints), 'maxLines' specifies how many lines (always the last ones) + * to keep in the log. 0 for 'maxLines' means "keep all lines". + **/ + YLogView( YWidget * parent, + const string & label, + int visibleLines, + int maxLines ); public: + + /** + * Destructor. + **/ + virtual ~YLogView(); + /** * Returns a descriptive name of this widget class for logging, * debugging etc. **/ virtual const char * widgetClass() const { return "YLogView"; } - /** - * Implements the ui command changeWidget for the widget specific - * properties. + * Return the label (the caption above the log text). **/ - YCPValue changeWidget( const YCPSymbol & property, const YCPValue & newvalue ); + string label() const; /** - * Implements the ui command changeWidget for the widget specific properties. + * Set the label (the caption above the log text). + * + * Derived classes are free to reimplement this, but they should call this + * base class method at the end of the overloaded function. **/ - YCPValue queryWidget( const YCPSymbol & property ); - + virtual void setLabel( const string & label ); /** - * Set the log text. + * Return the number of visible lines. **/ - virtual void setLogText( const YCPString & text ) = 0; + int visibleLines() const; /** - * Get the label above the log lines. + * Set the number of visible lines. Changing this has only effect upon the + * next geometry call, so applications calling this function might want to + * trigger a re-layout afterwards. + * + * This method is intentionally not virtual: visibleLines() should be + * queried in the preferredHeight() implementation. **/ - YCPString label() const { return _label; } + void setVisibleLines( int newVisibleLines ); /** - * Get the number of visible lines. + * Return the maximum number of lines to store. The last maxLines() lines + * of the log text will be kept. **/ - int visibleLines() const { return _visibleLines; } + int maxLines() const; /** - * Get the maximum number of lines to store. + * Set the maximum number of lines to store. "0" means "keep all lines" + * (beware of memory overflow!). + * + * If the new value is lower than the old value, any (now) excess lines + * before the last 'newMaxLines' lines of the log text is cut off and a + * display update is triggered. + * + * This method is intentionally not virtual since a display update is + * triggered when appropriate. **/ - int maxLines() const { return _maxLines; } + void setMaxLines( int newMaxLines ); /** - * Set the label above the log lines. Overload this, but call - * YLogView::setLabel at the end of your own function. + * Return the entire log text as one large string of concatenated lines + * delimited with newlines. **/ - virtual void setLabel( const YCPString & newLabel ); + string logText() const; /** - * Retrieve the entire log text as one large string of concatenated lines - * delimited with newlines. + * Set (replace) the entire log text and trigger a display update. **/ - string logText(); + void setLogText( const string & text ) + { clearText(); appendLines( text ); } /** - * Append one or more lines to the log text. + * Return the last log line. **/ - void appendText( const YCPString & text ); - + string lastLine() const; /** - * Append one single line to the log text. + * Append one or more lines to the log text and trigger a display update. **/ - void appendLine( const string & line ); + void appendLines( const string & text ); /** - * Clear the log text. + * Clear the log text and trigger a display update. **/ void clearText(); /** * Return the current number of lines. **/ - int lines() const { return _logText.size(); } + int lines() const; + + /** + * Set a property. + * Reimplemented from YWidget. + * + * This function may throw YUIPropertyExceptions. + * + * This function returns 'true' if the value was successfully set and + * 'false' if that value requires special handling (not in error cases: + * those are covered by exceptions). + **/ + virtual bool setProperty( const string & propertyName, + const YPropertyValue & val ); + + /** + * Get a property. + * Reimplemented from YWidget. + * + * This method may throw YUIPropertyExceptions. + **/ + virtual YPropertyValue getProperty( const string & propertyName ); + /** + * Return this class's property set. + * This also initializes the property upon the first call. + * + * Reimplemented from YWidget. + **/ + virtual const YPropertySet & propertySet(); /** * Get the string of this widget that holds the keyboard shortcut. * * Reimplemented from YWidget. **/ - virtual string shortcutString() { return label()->value(); } + virtual string shortcutString() { return label(); } /** * Set the string of this widget that holds the keyboard shortcut. @@ -124,18 +178,39 @@ * Reimplemented from YWidget. **/ virtual void setShortcutString( const string & str ) - { setLabel( YCPString( str ) ); } + { setLabel( str ); } + + +protected: + + /** + * Display the part of the log text that should be displayed. + * 'text' contains the last 'visibleLines()' lines. + * This is called whenever the log text changes. Note that the text might + * also be empty, in which case the displayed log text should be cleared. + * + * Derived classes are required to implement this. + **/ + virtual void displayLogText( const string & text ) = 0; private: + /** + * Append one single line to the log text. + **/ + void appendLine( const string & line ); + + /** + * Trigger a re-display of the log text. + **/ + void updateDisplay(); + + // Data members - YCPString _label; - int _visibleLines; - int _maxLines; + ImplPtr<YLogViewPrivate> priv; - deque<string> _logText; }; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI.h Tue Oct 9 16:28:19 2007 @@ -453,7 +453,6 @@ // FIXME: Obsolete public: virtual YDialog *createDialog( YWidgetOpt & opt ) = 0; - virtual YWidget *createLogView( YWidget *parent, YWidgetOpt & opt, const YCPString & label, int visibleLines, int maxLines ) = 0; virtual YWidget *createMenuButton( YWidget *parent, YWidgetOpt & opt, const YCPString & label ) = 0; // FIXME: Obsolete // FIXME: Obsolete Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h Tue Oct 9 16:28:19 2007 @@ -162,6 +162,7 @@ #define YUIProperty_Label "Label" #define YUIProperty_Labels "Labels" #define YUIProperty_LastLine "LastLine" +#define YUIProperty_MaxLines "MaxLines" #define YUIProperty_MaxValue "MaxValue" #define YUIProperty_MinValue "MinValue" #define YUIProperty_Notify "Notify" @@ -171,6 +172,7 @@ #define YUIProperty_ValidChars "ValidChars" #define YUIProperty_Value "Value" #define YUIProperty_Values "Values" +#define YUIProperty_VisibleLines "VisibleLines" #define YUIProperty_WidgetClass "WidgetClass" Modified: branches/tmp/sh/mod-ui/qt/src/YQLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQLogVie… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQLogView.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQLogView.cc Tue Oct 9 16:28:19 2007 @@ -17,9 +17,9 @@ /-*/ -#include <qlineedit.h> #include <qlabel.h> #include <qstyle.h> +#include <qmultilineedit.h> #define y2log_component "qt-ui" #include <ycp/y2log.h> @@ -31,25 +31,24 @@ #include "YQWidgetCaption.h" -YQLogView::YQLogView( QWidget * parent, - const YWidgetOpt & opt, - const YCPString & label, - int visLines, - int maxLines ) - : QVBox( parent ) - , YLogView( opt, label, visLines, maxLines ) +YQLogView::YQLogView( YWidget * parent, + const string & label, + int visibleLines, + int maxLines ) + : QVBox( (QWidget *) parent->widgetRep() ) + , YLogView( parent, label, visibleLines, maxLines ) { setWidgetRep( this ); setSpacing( YQWidgetSpacing ); setMargin( YQWidgetMargin ); - _caption = new YQWidgetCaption( this, label->value() ); + _caption = new YQWidgetCaption( this, label ); YUI_CHECK_NEW( _caption ); - + _qt_text = new QMultiLineEdit( this ); YUI_CHECK_NEW( _qt_text ); - + _qt_text->setReadOnly( true ); _qt_text->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); @@ -57,25 +56,52 @@ } -void YQLogView::setEnabled( bool enabled ) +YQLogView::~YQLogView() +{ + // NOP +} + + +void +YQLogView::displayLogText( const string & text ) +{ + _qt_text->setText( fromUTF8( text ) ); + _qt_text->scrollToBottom(); +} + + +void +YQLogView::setLabel( const string & label ) +{ + _caption->setText( label ); + YLogView::setLabel( label ); +} + + + +void +YQLogView::setEnabled( bool enabled ) { + _caption->setEnabled( enabled ); _qt_text->setEnabled( enabled ); YWidget::setEnabled( enabled ); } -int YQLogView::preferredWidth() +int +YQLogView::preferredWidth() { return max( 50, sizeHint().width() ); } -int YQLogView::preferredHeight() +int +YQLogView::preferredHeight() { int hintHeight = visibleLines() * _qt_text->fontMetrics().lineSpacing(); hintHeight += _qt_text->style().scrollBarExtent().height(); hintHeight += _qt_text->frameWidth() * 2; - + if ( _caption->isShown() ) hintHeight += _caption->sizeHint().height(); @@ -83,27 +109,15 @@ } -void YQLogView::setSize( int newWidth, int newHeight ) +void +YQLogView::setSize( int newWidth, int newHeight ) { resize( newWidth, newHeight ); } -void YQLogView::setLogText( const YCPString & text ) -{ - _qt_text->setText( fromUTF8( text->value() ) ); - _qt_text->scrollToBottom(); -} - - -void YQLogView::setLabel( const YCPString & label ) -{ - _caption->setText( label->value() ); - YLogView::setLabel( label ); -} - - -bool YQLogView::setKeyboardFocus() +bool +YQLogView::setKeyboardFocus() { _qt_text->setFocus(); Modified: branches/tmp/sh/mod-ui/qt/src/YQLogView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQLogVie… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQLogView.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQLogView.h Tue Oct 9 16:28:19 2007 @@ -21,12 +21,11 @@ #define YQLogView_h #include <qvbox.h> -#include <qmultilineedit.h> -#include <ycp/YCPString.h> #include "YLogView.h" class YQWidgetCaption; +class QMultiLineEdit; class YQLogView : public QVBox, public YLogView @@ -38,11 +37,35 @@ /** * Constructor **/ - YQLogView( QWidget * parent, - const YWidgetOpt & opt, - const YCPString & label, - int visibleLines, - int maxLines ); + YQLogView( YWidget * parent, + const string & label, + int visibleLines, + int maxLines ); + + /** + * Destructor. + **/ + virtual ~YQLogView(); + +protected: + /** + * Display the part of the log text that should be displayed. + * 'text' contains the last 'visibleLines()' lines. + * This is called whenever the log text changes. Note that the text might + * also be empty, in which case the displayed log text should be cleared. + * + * Implemented from YLogView. + **/ + virtual void displayLogText( const string & text ); + +public: + + /** + * Set the label (the caption above the log text). + * + * Reimplemented from YLogView. + **/ + virtual void setLabel( const string & label ); /** * Inherited from YWidget: Sets the enabled state of the @@ -75,17 +98,7 @@ /** * Accept the keyboard focus. **/ - bool setKeyboardFocus(); - - /** - * Set the widget's label header. - **/ - void setLabel( const YCPString & newLabel ); - - /** - * Set the log text. - **/ - void setLogText( const YCPString & text ); + virtual bool setKeyboardFocus(); protected: Modified: branches/tmp/sh/mod-ui/qt/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQUI.h?r… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQUI.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQUI.h Tue Oct 9 16:28:19 2007 @@ -432,7 +432,6 @@ /*** Widget creation methods, all reimplemented from YUI ***/ - YWidget * createLogView ( YWidget * parent, YWidgetOpt & opt, const YCPString & label, int visibleLines, int maxLines ); YWidget * createMenuButton ( YWidget * parent, YWidgetOpt & opt, const YCPString & label); Modified: branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQUI_wid… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc Tue Oct 9 16:28:19 2007 @@ -28,7 +28,6 @@ #include "YQDownloadProgress.h" #include "YQDumbTab.h" #include "YQIntField.h" -#include "YQLogView.h" #include "YQMenuButton.h" #include "YQMultiProgressMeter.h" #include "YQPackageSelectorPlugin.h" @@ -42,45 +41,6 @@ -bool YQUI::hasDate() -{ - return true; -} - -YWidget * YQUI::createDate ( YWidget * parent, - YWidgetOpt & opt, - const YCPString & label, - const YCPString & date ) -{ - return new YQDate( (QWidget *) ( parent->widgetRep() ), opt, label, date); -} - - -bool YQUI::hasTime() -{ - return true; -} - - -YWidget * YQUI::createTime ( YWidget * parent, - YWidgetOpt & opt, - const YCPString & label, - const YCPString & time ) -{ - return new YQTime( (QWidget *) ( parent->widgetRep() ), opt, label, time); -} - - -YWidget * YQUI::createLogView ( YWidget * parent, - YWidgetOpt & opt, - const YCPString & label, - int visibleLines, - int maxLines ) -{ - return new YQLogView( (QWidget *) ( parent->widgetRep() ), opt, label, visibleLines, maxLines); -} - - YQPackageSelectorPlugin * YQUI::packageSelectorPlugin() { static YQPackageSelectorPlugin * plugin = 0; @@ -208,4 +168,35 @@ } + +bool YQUI::hasDate() +{ + return true; +} + +YWidget * YQUI::createDate ( YWidget * parent, + YWidgetOpt & opt, + const YCPString & label, + const YCPString & date ) +{ + return new YQDate( (QWidget *) ( parent->widgetRep() ), opt, label, date); +} + + +bool YQUI::hasTime() +{ + return true; +} + + +YWidget * YQUI::createTime ( YWidget * parent, + YWidgetOpt & opt, + const YCPString & label, + const YCPString & time ) +{ + return new YQTime( (QWidget *) ( parent->widgetRep() ), opt, label, time); +} + + + // EOF Modified: branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWidget… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc Tue Oct 9 16:28:19 2007 @@ -261,7 +261,10 @@ YQLogView * YQWidgetFactory::createLogView( YWidget * parent, const string & label, int visibleLines, int storedLines ) { - return 0; // FIXME: TO DO + YQLogView * logView = new YQLogView( parent, label, visibleLines, storedLines ); + YUI_CHECK_NEW( logView ); + + return logView; } -- 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] r41294 - /tags/branch-SLE-10-SP1-2_13_56/users/
by jsuchome＠svn.opensuse.org 09 Oct '07

09 Oct '07

Author: jsuchome Date: Tue Oct 9 16:18:47 2007 New Revision: 41294 URL: http://svn.opensuse.org/viewcvs/yast?rev=41294&view=rev Log: Created tag branch-SLE-10-SP1-2_13_56 for users Added: tags/branch-SLE-10-SP1-2_13_56/users/ - copied from r41293, branches/SuSE-SLE-10-SP1-Branch/users/ -- 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] r41293 - in /branches/SuSE-SLE-10-SP1-Branch/users: VERSION package/yast2-users.changes src/Users.pm src/dialogs.ycp
by jsuchome＠svn.opensuse.org 09 Oct '07

09 Oct '07

Author: jsuchome Date: Tue Oct 9 16:18:15 2007 New Revision: 41293 URL: http://svn.opensuse.org/viewcvs/yast?rev=41293&view=rev Log: - backport following features for SLE10SP for F302865 and F302658: - during firstboot, show the same behaviour as in 2nd stage - Write function from plugin API is now called also on deleted users (currently only local) - added universal "plugin_modified" key to check whether user data were modified by plugin - check for crypted directories modifications before offering 'cryptconfig' installation (#274861) - enabled plugins for local users and groups - 2.13.56 Modified: branches/SuSE-SLE-10-SP1-Branch/users/VERSION branches/SuSE-SLE-10-SP1-Branch/users/package/yast2-users.changes branches/SuSE-SLE-10-SP1-Branch/users/src/Users.pm branches/SuSE-SLE-10-SP1-Branch/users/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/users/… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/users/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/users/VERSION Tue Oct 9 16:18:15 2007 @@ -1 +1 @@ -2.13.55 +2.13.56 Modified: branches/SuSE-SLE-10-SP1-Branch/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/users/… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/users/package/yast2-users.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/users/package/yast2-users.changes Tue Oct 9 16:18:15 2007 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Thu Oct 4 14:33:20 CEST 2007 - jsuchome(a)suse.cz + +- backport following features for SLE10SP for F302865 and F302658: +- during firstboot, show the same behaviour as in 2nd stage +- Write function from plugin API is now called also on deleted + users (currently only local) +- added universal "plugin_modified" key to check whether user + data were modified by plugin +- check for crypted directories modifications before offering + 'cryptconfig' installation (#274861) +- enabled plugins for local users and groups +- 2.13.56 + +------------------------------------------------------------------- Fri May 11 12:08:13 CEST 2007 - jsuchome(a)suse.cz - during autoinstallation, do not touch already created directories Modified: branches/SuSE-SLE-10-SP1-Branch/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/users/… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/users/src/Users.pm (original) +++ branches/SuSE-SLE-10-SP1-Branch/users/src/Users.pm Tue Oct 9 16:18:15 2007 @@ -1302,8 +1302,10 @@ $use_cracklib = ($security{"PASSWD_USE_CRACKLIB"} eq "yes"); $obscure_checks = ($security{"OBSCURE_CHECKS_ENAB"} eq "yes"); - $min_pass_length{"local"} = $security{"PASS_MIN_LEN"} || $min_pass_length{"local"}; - $min_pass_length{"system"} = $security{"PASS_MIN_LEN"} || $min_pass_length{"system"}; + if (defined $security{"PASS_MIN_LEN"}) { + $min_pass_length{"local"} = $security{"PASS_MIN_LEN"}; + $min_pass_length{"system"} = $security{"PASS_MIN_LEN"}; + } my $login_defs = SCR->Dir (".etc.login_defs"); if (contains ($login_defs, "CHARACTER_CLASS")) { @@ -1825,6 +1827,26 @@ if (Autologin->user () eq ($user_in_work{"uid"} || "")) { Autologin->Disable (); } + + my $type = $user_in_work{"type"}; + my $plugins = $user_in_work{"plugins"}; + + # --------- PluginPresent: check which plugins are in use for this user + # so they can be called in "Write" + my $result = UsersPlugins->Apply ("PluginPresent", { + "what" => "user", + "type" => $type, + }, \%user_in_work); + if (defined ($result) && ref ($result) eq "HASH") { + $plugins = []; + foreach my $plugin (keys %{$result}) { + if (bool ($result->{$plugin}) && !contains ($plugins, $plugin)) + { + push @{$plugins}, $plugin; + } + } + $user_in_work{"plugins"} = $plugins; + } return 1; } y2warning ("no such user"); @@ -2686,7 +2708,7 @@ if ($plugin_error) { return $plugin_error; } $result = UsersPlugins->Apply ("Edit", $args, \%user); - # check if plugin has done the 'EditBefore' action + # check if plugin has done the 'Edit' action if (defined $result->{$plugin} && ref ($result->{$plugin}) eq "HASH") { $result = ShowPluginWarning ($result); %user = %{$result->{$plugin}}; @@ -3299,9 +3321,12 @@ %org_user = %{$user{"org_user"}}; } if ($user{"type"} ne "ldap") { + if (($user{"plugin_modified"} || 0) == 1) { + return 1; #TODO save special plugin_modified global value? + } # grouplist can be ignored, it is a modification of groups while ( my ($key, $value) = each %org_user) { - + last if $ret; if ($key eq "grouplist") { next; } @@ -3322,23 +3347,25 @@ if (!defined $user{$key} || $user{$key} ne $value) { $ret = 1; - y2debug ("old value: $value, changed to: ", - $user{$key} || "-" ); + y2debug ("old value: ", $value || "(not defined)"); + y2debug ("... changed to: ", $user{$key} || "(not defined)" ); } } return $ret; -#FIXME what if there is a new key? it's not in org_user map... } # search result, because some attributes were not filled yet my @internal_keys = @{UsersLDAP->GetUserInternal ()}; foreach my $key (keys %user) { - + last if $ret; my $value = $user{$key}; if (!defined $user{$key} || contains (\@internal_keys, $key) || ref ($value) eq "HASH" ) { next; } - if (!defined ($org_user{$key})) { + if ($key eq "plugin_modified") { + $ret = 1; + } + elsif (!defined ($org_user{$key})) { if ($value ne "") { $ret = 1; } @@ -3356,15 +3383,43 @@ ref ($org_user{$key}) eq "YaST::YCP::Integer")) { if ($user{$key}->value() == $value->value()) { next;} } + y2debug (sformat ("$key modified: old %1 new %2", $org_user{$key}, $value)); $ret = 1; } } - if (!$ret && defined $org_user{"crypted_home_size"} && defined $user{"crypted_home_size"}) { + # TODO should be caught in the previous tests? + if (!$ret && + defined $org_user{"crypted_home_size"} && + defined $user{"crypted_home_size"}) + { $ret = ($org_user{"crypted_home_size"} ne $user{"crypted_home_size"}); } return $ret; } +# take the map of user and check if his crypted directory settings were modified +# return boolean +sub CryptedHomeModified { + + my $self = shift; + my $user = shift; + + my $username = $user->{"uid"} || ""; + my $org_username = $user->{"org_user"}{"uid"} || $username; + my $home = $user->{"homedirectory"} || ""; + my $org_home = $user->{"org_user"}{"homedirectory"} || $home; + my $home_size = $user->{"crypted_home_size"} || 0; + my $org_size = $user->{"org_user"}{"crypted_home_size"} || 0; + my $pw = $user->{"current_text_userpassword"}; + my $new_pw = $user->{"text_userpassword"}; + + return 0 if ($home_size == 0 && $org_size == 0); # nothing to do + return 0 if (!defined $pw && !defined $new_pw); # no change without password provided :-( + return 0 if ($home eq $org_home && $username eq $org_username && $home_size == $org_size && $pw eq $new_pw); + return 1; +} + + # Substitute the values of LDAP atributes, predefined in LDAP user configuration BEGIN { $TYPEINFO{SubstituteUserValues} = ["function", "void"] } sub SubstituteUserValues { @@ -3967,8 +4022,9 @@ } ##------------------------------------ -# remove home directories and -# execute USERDEL_POSTCMD scripts for local/system users which should be deleted +# 1. remove home directories, +# 2. execute USERDEL_POSTCMD scripts for deleted local/system users +# 3. call Write function of plugins to do the delete action sub PostDeleteUsers { my $ret = 1; @@ -3985,11 +4041,20 @@ if (!defined $removed_users{$type}) { next; } + my $plugin_error; foreach my $username (keys %{$removed_users{$type}}) { my %user = %{$removed_users{$type}{$username}}; my $cmd = sprintf ("$userdel_postcmd $username %i %i %s", $user{"uidnumber"}, $user{"gidnumber"}, $user{"homedirectory"}); SCR->Execute (".target.bash", $cmd); + # call the "Write" function from plugins... + my $args = { + "what" => "user", + "type" => $type, + "modified" => "deleted", + }; + my $result = UsersPlugins->Apply ("Write", $args, \%user); + $plugin_error = GetPluginError ($args, $result); }; }; return $ret; @@ -4179,7 +4244,7 @@ # only remember for which users we need to call cryptconfig foreach my $username (keys %{$modified_users{"ldap"}}) { my %user = %{$modified_users{"ldap"}{$username}}; - if (defined $user{"crypted_home_size"}) { + if (defined $user{"crypted_home_size"} && $self->CryptedHomeModified (\%user)) { $users_with_crypted_dir{$username} = \%user; } } @@ -4233,7 +4298,7 @@ if ($groups_modified) { if ($group_not_read) { # error popup (%s is a file name) - $ret = sprintf (__("File %s was not read correctly, so it will not be written."), "$base_directory/group"); + $ret = sprintf (__("File %s was not read correctly, so it will not be written."), $base_directory."/group"); Report->Error ($ret); return $ret; } @@ -4258,40 +4323,6 @@ Report->Error ($ret); return $ret; } - # -------------------------------------- call Write on plugins - foreach my $type (keys %modified_groups) { - if ($type eq "ldap") { next; } - foreach my $groupname (keys %{$modified_groups{$type}}) { - if ($plugin_error) { last;} - my $args = { - "what" => "group", - "type" => $type, - "modified" => $modified_groups{$type}{$groupname}{"modified"} - }; - my $result = UsersPlugins->Apply ("Write", $args, - $modified_groups{$type}{$groupname}); - $plugin_error = GetPluginError ($args, $result); - - # store commands for calling groupadd_cmd script - if ($groupadd_cmd ne "" && FileUtils->Exists ($groupadd_cmd)) { - my $group = $modified_groups{$type}{$groupname}; - my $mod = $group->{"modified"} || "no"; - if ($mod eq "imported" || $mod eq "added") { - my $cmd = sprintf ("%s %s", $groupadd_cmd, $groupname); - push @groupadd_postcommands, $cmd; - } - } - } - # unset the 'modified' flags after write - $self->UpdateGroupsAfterWrite ("local"); - $self->UpdateGroupsAfterWrite ("system"); - delete $modified_groups{"local"}; - delete $modified_groups{"system"}; - } - if ($plugin_error) { - Report->Error ($plugin_error); - return $plugin_error; - } if (!$write_only) { $nscd_group = 1; } @@ -4315,7 +4346,7 @@ if ($users_modified) { if ($passwd_not_read) { # error popup (%s is a file name) - $ret = sprintf (__("File %s was not correctly read, so it will not be written."), "$base_directory/passwd"); + $ret = sprintf (__("File %s was not correctly read, so it will not be written."), $base_directory."/passwd"); Report->Error ($ret); return $ret; } @@ -4340,25 +4371,6 @@ Report->Error ($ret); return $ret; } - # -------------------------------------- call Write on plugins - foreach my $type (keys %modified_users) { - if ($type eq "ldap") { next; } - foreach my $username (keys %{$modified_users{$type}}) { - if ($plugin_error) { last;} - my $args = { - "what" => "user", - "type" => $type, - "modified" => $modified_users{$type}{$username}{"modified"} - }; - my $result = UsersPlugins->Apply ("Write", $args, - $modified_users{$type}{$username}); - $plugin_error = GetPluginError ($args, $result); - } - } - if ($plugin_error) { - Report->Error ($plugin_error); - return $plugin_error; - } if (!$write_only) { $nscd_passwd = 1; } @@ -4378,7 +4390,7 @@ my $gid = $user{"gidnumber"}; my $create_home = $user{"create_home"}; my $skel = $useradd_defaults{"skel"}; - if (defined $user{"crypted_home_size"}) { + if (defined $user{"crypted_home_size"} && $self->CryptedHomeModified (\%user)) { $users_with_crypted_dir{$username} = \%user; } if ($user_mod eq "imported" || $user_mod eq "added") { @@ -4431,12 +4443,6 @@ } } } - # unset the 'modified' flags after write - $self->UpdateUsersAfterWrite ("local"); - $self->UpdateUsersAfterWrite ("system"); - # not modified after successful write - delete $modified_users{"local"}; - delete $modified_users{"system"}; } if (%users_with_crypted_dir) { Package->Install ("cryptconfig"); @@ -4458,7 +4464,7 @@ if ($users_modified) { if ($shadow_not_read) { # error popup (%s is a file name) - $ret = sprintf (__("File %s was not correctly read, so it will not be written."), "$base_directory/shadow"); + $ret = sprintf (__("File %s was not correctly read, so it will not be written."), $base_directory."/shadow"); Report->Error ($ret); return $ret; } @@ -4479,6 +4485,72 @@ } } + # last operation on plugins must be done after nscd restart + # (at least quota seems to need it) + if ($users_modified) { + # -------------------------------------- call Write on plugins + foreach my $type (keys %modified_users) { + if ($type eq "ldap") { next; } + foreach my $username (keys %{$modified_users{$type}}) { + if ($plugin_error) { last;} + my $args = { + "what" => "user", + "type" => $type, + "modified" => $modified_users{$type}{$username}{"modified"} + }; + my $result = UsersPlugins->Apply ("Write", $args, + $modified_users{$type}{$username}); + $plugin_error = GetPluginError ($args, $result); + } + } + if ($plugin_error) { + Report->Error ($plugin_error); + return $plugin_error; + } + # unset the 'modified' flags after write + $self->UpdateUsersAfterWrite ("local"); + $self->UpdateUsersAfterWrite ("system"); + # not modified after successful write + delete $modified_users{"local"}; + delete $modified_users{"system"}; + } + if ($groups_modified) { + # -------------------------------------- call Write on plugins + foreach my $type (keys %modified_groups) { + if ($type eq "ldap") { next; } + foreach my $groupname (keys %{$modified_groups{$type}}) { + if ($plugin_error) { last;} + my $args = { + "what" => "group", + "type" => $type, + "modified" => $modified_groups{$type}{$groupname}{"modified"} + }; + my $result = UsersPlugins->Apply ("Write", $args, + $modified_groups{$type}{$groupname}); + $plugin_error = GetPluginError ($args, $result); + + # store commands for calling groupadd_cmd script + if ($groupadd_cmd ne "" && FileUtils->Exists ($groupadd_cmd)) { + my $group = $modified_groups{$type}{$groupname}; + my $mod = $group->{"modified"} || "no"; + if ($mod eq "imported" || $mod eq "added") { + my $cmd = sprintf ("%s %s", $groupadd_cmd, $groupname); + push @groupadd_postcommands, $cmd; + } + } + } + # unset the 'modified' flags after write + $self->UpdateGroupsAfterWrite ("local"); + $self->UpdateGroupsAfterWrite ("system"); + delete $modified_groups{"local"}; + delete $modified_groups{"system"}; + } + if ($plugin_error) { + Report->Error ($plugin_error); + return $plugin_error; + } + } + # call make on NIS server if (($users_modified || $groups_modified) && $nis_master) { my %out = %{SCR->Execute (".target.bash_output", @@ -4774,9 +4846,9 @@ } my $filtered = $username; - + my $type = $user_in_work{"type"} || ""; # Samba users may need to have '$' at the end of username (#40433) - if (($user_in_work{"type"} || "") eq "ldap") { + if ($type eq "ldap") { $filtered =~ s/\$$//g; } my $grep = SCR->Execute (".target.bash_output", "echo '$filtered' | grep '\^$character_class\$'", { "LANG" => "C" }); Modified: branches/SuSE-SLE-10-SP1-Branch/users/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/users/… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/users/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/users/src/dialogs.ycp Tue Oct 9 16:18:15 2007 @@ -37,6 +37,14 @@ string default_pw = "******"; +// check if this is installation stage - +// adding user during firstboot should be same as during 2nd stage +define boolean installation () { + return Stage::cont () || Stage::firstboot (); +} + + + /** * Upperase letters were used in username! (see bug #26409) * In these popup, ask user what to do. @@ -138,8 +146,7 @@ define symbol EditUserDialog (string what) { // user has returned to the "add user dialog" during installation workflow: - if (Users::StartDialog ("user_add") && - Stage::cont () && Users::UseNextTime ()) + if (Users::StartDialog ("user_add") && installation () && Users::UseNextTime ()) { Users::RestoreCurrentUser (); Users::SetUseNextTime (false); @@ -222,7 +229,7 @@ ((user_type == "ldap" && Ldap::file_server) || (user_type == "local" || user_type == "system")); - boolean complex_layout = Stage::cont () && Users::StartDialog ("user_add"); + boolean complex_layout = installation () && Users::StartDialog ("user_add"); map<string,integer> groups = user["grouplist"]:$[]; list available_shells = Users::AllShells (); @@ -247,6 +254,8 @@ string plugin_client = ""; string plugin = ""; map client2plugin = $[]; + // names of plugin GUI clients + list<string> clients = []; /** * initialize local variables with current state of user @@ -360,7 +369,7 @@ `HStretch() ); } - else if (!do_not_edit && !Stage::cont ()) + else if (!do_not_edit && !installation ()) { optionbox = `VBox ( `VSpacing (1), @@ -533,7 +542,7 @@ ) ), // IntField label - `IntField (`id (`dirsize), _("&Directory Size in MB"), 10, 2147483647, crypted_home_size) + `IntField (`id (`dirsize), _("&Directory Size in MB"), 10, 2147483647, crypted_home_size) // for max value, see bug 244631 :-) ) : `HBox (); return `HBox ( @@ -656,22 +665,6 @@ */ define term get_plugins_term () { - // UsersPlugins will filter out plugins we cannot use for given type - map plugin_clients = UsersPlugins::Apply ("GUIClient", - $[ "what" : "user", "type" : user_type ], $[] - ); - // remove empty clients - plugin_clients = filter (string plugin, string client, - (map<string,string>) plugin_clients, ``(client != "")); - - client2plugin = $[]; - list<string> clients = maplist (string plugin, string client, - (map<string,string>) plugin_clients, { - - client2plugin [client] = plugin; - return client; - }); - plugin_client = clients[0]:""; plugin = client2plugin[plugin_client]:plugin_client; @@ -737,7 +730,19 @@ tabs = add (tabs,`item(`id(`passwordsettings),_("Pass&word Settings"))); } - if (user_type == "ldap") + // Now initialize the list of plugins: we must know now if there is some available. + // UsersPlugins will filter out plugins we cannot use for given type + map plugin_clients = UsersPlugins::Apply ("GUIClient", + $[ "what" : "user", "type" : user_type ], $[] + ); + // remove empty clients + plugin_clients = filter (string plugin, string client, + (map<string,string>) plugin_clients, ``(client != "")); + clients = maplist (string plugin, string client, (map<string,string>) plugin_clients, { + client2plugin [client] = plugin; + return client; + }); + if (clients != []) { // tab label tabs = add (tabs, `item(`id(`plugins), _("Plu&g-Ins") )); @@ -1084,7 +1089,7 @@ } } // --------------------------------- autologin (during installation) - if (Users::StartDialog ("user_add") && Stage::cont ()) + if (Users::StartDialog ("user_add") && installation ()) { Users::SetRootMail ((boolean) UI::QueryWidget(`id (`root_mail), `Value) ? username : ""); @@ -1448,6 +1453,7 @@ } if (ret == `run) { + boolean plugin_added = false; // first, add the plugin if necessary if (!contains (user["plugins"]:[], plugin)) { @@ -1458,10 +1464,9 @@ ret = `notnext; continue; } + plugin_added = true; user = Users::GetCurrentUser (); reinit_userdata (); - UI::ChangeWidget (`id(`table), `Item (plugin_client,0), - UI::Glyph (`CheckMark)); } any plugin_ret = WFM::CallFunction ( plugin_client, ["Dialog", $[ "what" : "user" ], user ]); @@ -1470,6 +1475,20 @@ // update the map of changed user user = Users::GetCurrentUser (); reinit_userdata (); + UI::ChangeWidget (`id(`table), `Item (plugin_client,0), UI::Glyph (`CheckMark)); + } + // for `cancel we must remove the plugin if it was added because of `run + else if (plugin_added) + { + error = Users::RemoveUserPlugin (plugin); + if (error != "") + { + Popup::Error (error); + ret = `notnext; + continue; + } + user = Users::GetCurrentUser (); + reinit_userdata (); } } } @@ -1478,7 +1497,7 @@ if (ret == `edit) { Wizard::SetHelpText ( - EditUserDialogHelp (Stage::cont (), user_type, what)); + EditUserDialogHelp (installation (), user_type, what)); UI::ReplaceWidget(`tabContents, get_edit_term ()); // update the contets of User Data Dialog @@ -1695,6 +1714,7 @@ string plugin_client = ""; string plugin = ""; map client2plugin = $[]; + list<string> clients = []; /** * initialize local variables with current state of group @@ -1762,22 +1782,6 @@ */ define term get_plugins_term () { - // UsersPlugins will filter out plugins we cannot use for given type - map plugin_clients = UsersPlugins::Apply ("GUIClient", - $[ "what" : "group", "type" : group_type ], $[] - ); - // remove empty clients - plugin_clients = filter (string plugin, string client, - (map<string,string>) plugin_clients, ``(client != "")); - - client2plugin = $[]; - list<string> clients = maplist (string plugin, string client, - (map<string,string>) plugin_clients, { - - client2plugin [client] = plugin; - return client; - }); - plugin_client = clients[0]:""; plugin = client2plugin[plugin_client]:plugin_client; @@ -1810,7 +1814,21 @@ list<term> tabs = []; term dialog_contents = `Empty (); - boolean use_tabs = group_type == "ldap"; + + // Now initialize the list of plugins: we must know now if there is some available. + // UsersPlugins will filter out plugins we cannot use for given type + map plugin_clients = UsersPlugins::Apply ("GUIClient", + $[ "what" : "group", "type" : group_type ], $[] + ); + // remove empty clients + plugin_clients = filter (string plugin, string client, + (map<string,string>) plugin_clients, ``(client != "")); + clients = maplist (string plugin, string client, (map<string,string>) plugin_clients, { + client2plugin [client] = plugin; + return client; + }); + boolean use_tabs = (size (clients) > 0); + boolean has_tabs = true; if (use_tabs) { @@ -1827,6 +1845,7 @@ ); if (!UI::HasSpecialWidget (`DumbTab)) { + has_tabs = false; term tabbar = `HBox (); foreach (term it, tabs, { string label = it[1]:""; @@ -1853,6 +1872,14 @@ symbol current = nil; list tabids = [`edit, `plugins ]; + // switch focus to specified tab (after error message) and widget inside + define void focus_tab (symbol tab, any widget) { + if (use_tabs && has_tabs) + UI::ChangeWidget (`id (`tabs), `CurrentItem, tab); + UI::SetFocus (`id (widget)); + ret = `notnext; + } + repeat { // map returned from Check*UI functions @@ -1896,8 +1923,7 @@ if (error != "") { Report::Error (error); - UI::SetFocus (`id(`groupname)); - ret = `notnext; + focus_tab (current, `groupname); continue; } // --------------------------------- password checks @@ -1908,8 +1934,7 @@ Report::Error(_("The passwords do not match. Try again.")) ; - ret = `notnext; - UI::SetFocus(`id(`pw1)); + focus_tab (current, `pw1); continue; } if ( pw1 != "" && pw1 != default_pw ) @@ -1918,8 +1943,7 @@ if (error != "") { Report::Error (error); - ret = `notnext; - UI::SetFocus(`id(`pw1)); + focus_tab (current, `pw1); continue; } boolean failed = false; @@ -1938,8 +1962,7 @@ } while (error_map != $[] && !failed); if (failed) { - ret = `notnext; - UI::SetFocus(`id(`pw1)); + focus_tab (current, `pw1); continue; } password = pw1; @@ -1954,8 +1977,7 @@ if (error != "") { Report::Error (error); - UI::SetFocus (`id(`gid)); - ret = `notnext; + focus_tab (current, `gid); continue; } error_map = Users::CheckGIDUI (new_i_gid, ui_map); @@ -1963,8 +1985,7 @@ { if (!Popup::YesNo (error_map ["question"]:"")) { - ret = `notnext; - UI::SetFocus(`id(`gid)); + focus_tab (current, `gid); continue; } if(contains(["local","system"],error_map["question_id"]:"")) @@ -2067,6 +2088,7 @@ } if (ret == `run) { + boolean plugin_added = false; // first, add the plugin if necessary if (!contains (group["plugins"]:[], plugin)) { @@ -2077,10 +2099,9 @@ ret = `notnext; continue; } + plugin_added = true; group = Users::GetCurrentGroup (); reinit_groupdata (); - UI::ChangeWidget (`id(`table), `Item (plugin_client,0), - UI::Glyph (`CheckMark)); } any plugin_ret = WFM::CallFunction ( plugin_client, ["Dialog", $[ "what" : "group" ], group ]); @@ -2089,6 +2110,19 @@ // update the map of changed group group = Users::GetCurrentGroup (); reinit_groupdata (); + UI::ChangeWidget (`id(`table), `Item (plugin_client,0), UI::Glyph (`CheckMark)); + } + else if (plugin_added) + { + error = Users::RemoveGroupPlugin (plugin); + if (error != "") + { + Popup::Error (error); + ret = `notnext; + continue; + } + group = Users::GetCurrentGroup (); + reinit_groupdata (); } } } @@ -2613,7 +2647,7 @@ boolean changed = false; list param = []; - if (Stage::cont ()) + if (installation ()) { param = [ "from_users" ]; } @@ -2680,7 +2714,7 @@ Users::CommitUser (); // adding only one user during install - if (Stage::cont () && Users::StartDialog ("user_add") ) + if (installation () && Users::StartDialog ("user_add") ) return `save; else return `next; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0