November 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r59836 - in /branches/SuSE-SLE-10-SP2-Branch/ncurses/src: NCPad.cc NCPad.h NCTablePad.cc NCTablePad.h NCtext.cc ncursesw.h
by mlandres＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: mlandres Date: Fri Nov 27 18:50:18 2009 New Revision: 59836 URL: http://svn.opensuse.org/viewcvs/yast?rev=59836&view=rev Log: Work around 32768 lines limit in ncurses table. (bnc #550733) Modified: branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCPad.cc branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCPad.h branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCTablePad.cc branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCTablePad.h branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCtext.cc branches/SuSE-SLE-10-SP2-Branch/ncurses/src/ncursesw.h Modified: branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCPad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ncurse… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCPad.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCPad.cc Fri Nov 27 18:50:18 2009 @@ -19,6 +19,42 @@ #include "Y2Log.h" #include "NCPad.h" +#if 0 +#undef DBG_CLASS +#define DBG_CLASS "_NCPad_" +#endif + +/////////////////////////////////////////////////////////////////// + +// PAD_PAGESIZE needs to be large enough to feed any destwin. We +// get in throuble here if the terminal has more than 1024 lines. +#define PAD_PAGESIZE 1024 + +// Maximum height of the NCursesPad (e.g. in case it can't hold more +// than 32768 lines). Larger pads need to page. +//#define MAX_PAD_HEIGHT 100 +#define MAX_PAD_HEIGHT NCursesWindow::maxcoord() + +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPad::NCPad +// METHOD TYPE : Constructor +// +NCPad::NCPad( int lines, int cols, const NCWidget & p ) + : NCursesPad( lines > MAX_PAD_HEIGHT ? PAD_PAGESIZE : lines, cols ) + , _vheight( lines > MAX_PAD_HEIGHT ? lines : 0 ) + , parw( p ) + , destwin ( 0 ) + , maxdpos ( 0 ) + , maxspos ( 0 ) + , dclear ( false ) + , dirty ( false ) +{ + IDBG << maxcoord() << endl; +} + + /////////////////////////////////////////////////////////////////// // // @@ -33,9 +69,9 @@ destwin = dwin; if ( destwin ) { - wsze mysze( maxy()+1, maxx()+1 ); + wsze mysze( vheight(), width() ); - drect = wrect( 0, wsze(destwin->maxy()+1, destwin->maxx()+1) ); + drect = wrect( 0, wsze(destwin->height(), destwin->width()) ); srect = wrect( 0, wsze::min( mysze, drect.Sze ) ); maxdpos = drect.Pos + srect.Sze - 1; maxspos = mysze - srect.Sze; @@ -61,12 +97,27 @@ void NCPad::resize( wsze nsze ) { SetPadSize( nsze ); // might be enlarged by NCPadWidget if redirected - if ( nsze.H != height() + + if ( nsze.H != vheight() || nsze.W != width() ) { NCursesWindow * odest = Destwin(); if ( odest ) Destwin( 0 ); - NCursesPad::resize( nsze.H, nsze.W ); + + if ( nsze.H > MAX_PAD_HEIGHT ) + { + IDBG << "TRUCNATE PAD: " << nsze.H << " > " << MAX_PAD_HEIGHT << endl; + NCursesPad::resize( PAD_PAGESIZE, nsze.W ); + _vheight = nsze.H; + } + else + { + NCursesPad::resize( nsze.H, nsze.W ); + _vheight = 0; + } + + IDBG << "Pageing ?: " << pageing() << endl; + if ( odest ) Destwin( odest ); } @@ -106,11 +157,27 @@ updateScrollHint(); + if ( ! pageing() ) + { + return copywin( *destwin, + srect.Pos.L, srect.Pos.C, + drect.Pos.L, drect.Pos.C, + maxdpos.L, maxdpos.C, + false ); + } + + // Here: Table is pageing, so we must prepare the visible lines + // on the Pad before we're copying them to the destwin: + wsze lSze( 1, width() ); + for ( unsigned i = 0; i <= maxdpos.L; ++i ) + { + directDraw( *this, wrect( wpos( i, 0 ), lSze ), srect.Pos.L+i ); + } return copywin( *destwin, - srect.Pos.L, srect.Pos.C, - drect.Pos.L, drect.Pos.C, - maxdpos.L, maxdpos.C, - false ); + 0, srect.Pos.C, + drect.Pos.L, drect.Pos.C, + maxdpos.L, maxdpos.C, + false ); } return OK; } @@ -162,7 +229,7 @@ ScrlUp( destwin->maxy() ); break; case KEY_HOME: - ScrlUp( maxy() ); + ScrlUp( vheight() ); break; case KEY_DOWN: @@ -172,7 +239,7 @@ ScrlDown( destwin->maxy() ); break; case KEY_END: - ScrlDown( maxy() ); + ScrlDown( vheight() ); break; case KEY_LEFT: Modified: branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCPad.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ncurse… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCPad.h (original) +++ branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCPad.h Fri Nov 27 18:50:18 2009 @@ -33,7 +33,7 @@ class NCSchrollCB { public: - + virtual ~NCSchrollCB () {} // callback @@ -97,6 +97,23 @@ // class NCPad : public NCursesPad, public NCScrollHint { + private: + + /** The real height in case the NCursesPad is truncated, otherwise \c 0. + * + * \note Don't use _vheight directly, but \ref vheight. + * + * Up to ncurses5, ncurses uses \c short for window dimensions (can't hold + * more than 32768 lines). If \ref resize truncated the window, the real + * size is in \ref _vheight. Longer lists need to be paged. + * + * \todo Once all NCPad based types are able to page, \a maxPadHeight could be + * set to e.g \c 1024 to avoid bigger widgets in memory. Currently just + * \ref NCTablePad supports paging. If paging is \c ON, all content lines are + * written via \ref directDraw. Without pageing \ref DoRedraw is reponsible for this. + */ + int _vheight; + protected: const NCWidget & parw; @@ -110,6 +127,12 @@ bool dclear; bool dirty; + /** The (virtual) height of the Pad (even if truncated). */ + int vheight() const { return _vheight ? _vheight : height(); } + + /** Whether the Pad is truncated (we're pageing). */ + bool pageing() const { return _vheight; } + protected: virtual int dirtyPad() { dirty = false; return setpos( CurPos() ); } @@ -121,17 +144,20 @@ virtual void updateScrollHint(); + /** Directly draw a table item at a specific location. + * + * \ref update usually copies the visible table content from the + * \ref NCursesPad to \ref destwin. In case the \ref NCursesPad + * is truncated, the visible lines are prepared immediately before + * they are written to \ref destwin + * . + * \see \ref _vheight. + */ + virtual void directDraw( NCursesWindow & w, const wrect at, unsigned lineno ) {} + public: - NCPad( int lines, int cols, const NCWidget & p ) - : NCursesPad( lines, cols ) - , parw( p ) - , destwin ( 0 ) - , maxdpos ( 0 ) - , maxspos ( 0 ) - , dclear ( false ) - , dirty ( false ) - {} + NCPad( int lines, int cols, const NCWidget & p ); virtual ~NCPad() {} public: Modified: branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCTablePad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ncurse… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCTablePad.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCTablePad.cc Fri Nov 27 18:50:18 2009 @@ -92,7 +92,7 @@ delete Items[i]; } } - + Items.resize( idx, 0 ); for( unsigned i = olines; i < Lines(); ++i ) { if ( !Items[i] ) @@ -241,10 +241,10 @@ // wsze NCTablePad::UpdateFormat() { - IDBG << endl; dirty = true; dirtyFormat = false; ItemStyle.ResetToMinCols(); + for( unsigned l = 0; l < Lines(); ++l ) { Items[l]->UpdateFormat( ItemStyle ); } @@ -274,11 +274,17 @@ bkgdset( ItemStyle.getBG() ); clear(); + wsze lSze( 1, width() ); - for ( unsigned l = 0; l < Lines(); ++l ) { - Items[l]->DrawAt( *this, wrect( wpos( l, 0 ), lSze ), - ItemStyle, ((unsigned)citem.L == l) ); + + if ( ! pageing() ) + { + for ( unsigned l = 0; l < Lines(); ++l ) { + Items[l]->DrawAt( *this, wrect( wpos( l, 0 ), lSze ), + ItemStyle, ((unsigned)citem.L == l) ); + } } + // else: item drawing requested via directDraw if ( Headpad.width() != width() ) Headpad.resize( 1, width() ); @@ -291,6 +297,14 @@ return update(); } +void NCTablePad::directDraw( NCursesWindow & w, const wrect at, unsigned lineno ) +{ + if ( lineno < Lines() ) + Items[lineno]->DrawAt( w, at, ItemStyle, ((unsigned)citem.L == lineno) ); + else + IDBG << "Illegal Lineno " << lineno << " (" << Lines() << ")" << endl; +} + /////////////////////////////////////////////////////////////////// // // @@ -307,7 +321,7 @@ return OK; } SDBG << newpos << " : l " << Lines() << " : cl " << citem.L - << " : d " << dirty << " : df " << dirtyFormat << endl; + << " : d " << dirty << " : df " << dirtyFormat << endl; if ( dirtyFormat ) UpdateFormat(); @@ -326,14 +340,18 @@ return DoRedraw(); } - // adjust only - if ( citem.L != oitem ) { - Items[oitem]->DrawAt( *this, wrect( wpos( oitem, 0 ), wsze( 1, width() ) ), - ItemStyle, false ); - } + if ( ! pageing() ) + { + // adjust only + if ( citem.L != oitem ) { + Items[oitem]->DrawAt( *this, wrect( wpos( oitem, 0 ), wsze( 1, width() ) ), + ItemStyle, false ); + } - Items[citem.L]->DrawAt( *this, wrect( wpos( citem.L, 0 ), wsze( 1, width() ) ), - ItemStyle, true ); + Items[citem.L]->DrawAt( *this, wrect( wpos( citem.L, 0 ), wsze( 1, width() ) ), + ItemStyle, true ); + } + // else: item drawing requested via directDraw if ( srect.Pos.C != opos ) SendHead(); Modified: branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCTablePad.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ncurse… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCTablePad.h (original) +++ branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCTablePad.h Fri Nov 27 18:50:18 2009 @@ -67,6 +67,8 @@ virtual int DoRedraw(); virtual void updateScrollHint(); + virtual void directDraw( NCursesWindow & w, const wrect at, unsigned lineno ); + public: NCTablePad( int lines, int cols, const NCWidget & p ); @@ -83,7 +85,7 @@ wsze tableSize() { return dirtyFormat ? UpdateFormat() : wsze( Lines(), ItemStyle.TableWidth() ); } - + void setOrder( int column ); public: @@ -120,7 +122,7 @@ const NCTableLine * GetLine( unsigned idx ) const; NCTableLine * ModifyLine( unsigned idx ); - + void stripHotkeys(); }; Modified: branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCtext.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ncurse… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCtext.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/ncurses/src/NCtext.cc Fri Nov 27 18:50:18 2009 @@ -322,7 +322,7 @@ w.move( l, area.Pos.C + pre ); } - NCDBG << "TERMINAL: " << NCstring::terminalEncoding() << " CODESET: " << nl_langinfo( CODESET) << endl; + DDBG << "TERMINAL: " << NCstring::terminalEncoding() << " CODESET: " << nl_langinfo( CODESET) << endl; if ( len ) { if ( NCstring::terminalEncoding() != "UTF-8" ) Modified: branches/SuSE-SLE-10-SP2-Branch/ncurses/src/ncursesw.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ncurse… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ncurses/src/ncursesw.h (original) +++ branches/SuSE-SLE-10-SP2-Branch/ncurses/src/ncursesw.h Fri Nov 27 18:50:18 2009 @@ -27,6 +27,7 @@ #include <etip.h> #include <cstdio> #include <cstdarg> +#include <climits> #include "position.h" extern "C" { @@ -746,6 +747,9 @@ #define bkgdset UNDEF(bkgdset) #endif +template <class _Tp> inline int ncursesMaxCoord() { return INT_MAX; } +template <> inline int ncursesMaxCoord<short>() { return SHRT_MAX; } + /** * @short C++ class for windows. */ @@ -959,6 +963,8 @@ */ int maxy() const { return w->_maxy; } + /** Ncurses up to ncurses5 internally uses \c short. */ + static int maxcoord() { return ncursesMaxCoord<NCURSES_SIZE_T>(); } wsze size() const { return wsze(height(),width()); } wpos begpos() const { return wpos(begy(),begx()); } @@ -1106,16 +1112,16 @@ /** * Put attributed character from given position to the window. - */ + */ int add_attr_char( int y, int x ); int add_attr_char(); - + /** * Put a combined character to the window. */ int add_wch( const cchar_t * cch ) { return ::wadd_wch(w, cch); } int add_wch( int y, int x, const cchar_t * cch ) { return mvwadd_wch(w, y, x, cch); } - + /** * Move cursor to the requested position and then put attributed character * to the window. @@ -1154,7 +1160,7 @@ * NUL or the limit n is reached. If n is negative, it is ignored. */ int addwstr(const wchar_t* str, int n=-1); - + /** * Move the cursor to the requested position and then perform the addwstr * as described above. @@ -1306,9 +1312,9 @@ // int box(chtype vert=0, chtype hor=0) { // return ::wborder(w, vert, vert, hor, hor, 0, 0 ,0, 0); } - // workaround for 8.1: don't use wborder to draw the box + // workaround for 8.1: don't use wborder to draw the box int box() { return box(wrect( wpos(0,0), size() )); } - + /** * Draw a border around the window with the given characters for the * various parts of the border. If you pass zero for a character, curses -- 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] r59835 - /tags/stable-2_19_0/storage/
by aschnell＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: aschnell Date: Fri Nov 27 17:22:11 2009 New Revision: 59835 URL: http://svn.opensuse.org/viewcvs/yast?rev=59835&view=rev Log: Created tag stable-2_19_0 for storage Added: tags/stable-2_19_0/storage/ (props changed) - copied from r59834, trunk/storage/ -- 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] r59834 - in /branches/SuSE-Code-11-SP1-Branch/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: aschnell Date: Fri Nov 27 17:18:12 2009 New Revision: 59834 URL: http://svn.opensuse.org/viewcvs/yast?rev=59834&view=rev Log: - enable boot.crypt-early along with boot.crypto (bnc #558888) Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Fri Nov 27 17:18:12 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 27 17:08:15 CET 2009 - aschnell(a)suse.de + +- enable boot.crypt-early along with boot.crypto (bnc #558888) + +------------------------------------------------------------------- Fri Nov 27 15:46:26 CET 2009 - aschnell(a)suse.de - adapted libstorage to change of multipath output Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Fri Nov 27 17:18:12 2009 @@ -5593,6 +5593,10 @@ string cmd = "cd / && /sbin/insserv /etc/init.d/boot.crypto"; map bo = (map)SCR::Execute (.target.bash_output, cmd ); y2milestone( "Update bo %1", bo ); + + cmd = "cd / && /sbin/insserv /etc/init.d/boot.crypto-early"; + bo = (map)SCR::Execute (.target.bash_output, cmd ); + y2milestone( "Update bo %1", bo ); } // set flag -> it indicates that Update was already called called_update = true; @@ -5935,7 +5939,11 @@ need_crypt, need_md, need_lvm, need_dmraid, need_dmmultipath ); if( need_crypt ) + { CallInsserv( true, "boot.crypto" ); + CallInsserv( true, "boot.crypto-early" ); + } + CallInsserv( need_md, "boot.md" ); CallInsserv( need_lvm, "boot.lvm" ); CallInsserv( need_dmraid, "boot.dmraid" ); -- 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] r59833 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp storage/src/modules/StorageUpdate.ycp
by aschnell＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: aschnell Date: Fri Nov 27 17:10:46 2009 New Revision: 59833 URL: http://svn.opensuse.org/viewcvs/yast?rev=59833&view=rev Log: - enable boot.crypt-early along with boot.crypto (bnc #558888) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageUpdate.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 Fri Nov 27 17:10:46 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 27 17:08:15 CET 2009 - aschnell(a)suse.de + +- enable boot.crypt-early along with boot.crypto (bnc #558888) + +------------------------------------------------------------------- Thu Nov 26 17:07:16 CET 2009 - fehr(a)suse.de - disable impossible mountby methods (#444328) 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 Fri Nov 27 17:10:46 2009 @@ -4809,7 +4809,11 @@ need_crypt, need_md, need_lvm, need_dmraid, need_dmmultipath ); if( need_crypt ) + { CallInsserv( true, "boot.crypto" ); + CallInsserv( true, "boot.crypto-early" ); + } + CallInsserv( need_md, "boot.md" ); CallInsserv( need_lvm, "boot.lvm" ); CallInsserv( need_dmraid, "boot.dmraid" ); Modified: trunk/storage/storage/src/modules/StorageUpdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageUpdate.ycp (original) +++ trunk/storage/storage/src/modules/StorageUpdate.ycp Fri Nov 27 17:10:46 2009 @@ -383,6 +383,10 @@ string cmd = "cd / && /sbin/insserv /etc/init.d/boot.crypto"; map bo = (map)SCR::Execute (.target.bash_output, cmd ); y2milestone( "Update bo %1", bo ); + + cmd = "cd / && /sbin/insserv /etc/init.d/boot.crypto-early"; + bo = (map)SCR::Execute (.target.bash_output, cmd ); + y2milestone( "Update bo %1", bo ); } // set flag -> it indicates that Update was already called called_update = 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] r59832 - /tags/stable-2_19_1/samba-client/
by jsuchome＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: jsuchome Date: Fri Nov 27 16:28:51 2009 New Revision: 59832 URL: http://svn.opensuse.org/viewcvs/yast?rev=59832&view=rev Log: Created tag stable-2_19_1 for samba-client Added: tags/stable-2_19_1/samba-client/ - copied from r59831, trunk/samba-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] r59830 - in /trunk/samba-client: VERSION agents/cfg_smbconf.scr package/yast2-samba-client.changes src/SambaConfig.pm
by jsuchome＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: jsuchome Date: Fri Nov 27 16:28:42 2009 New Revision: 59830 URL: http://svn.opensuse.org/viewcvs/yast?rev=59830&view=rev Log: - preserve case of keys in smb.conf (bnc#555579) - 2.19.1 Modified: trunk/samba-client/VERSION trunk/samba-client/agents/cfg_smbconf.scr trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/SambaConfig.pm Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=59830&r… ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Fri Nov 27 16:28:42 2009 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/samba-client/agents/cfg_smbconf.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/agents/cfg_smbconf.… ============================================================================== --- trunk/samba-client/agents/cfg_smbconf.scr (original) +++ trunk/samba-client/agents/cfg_smbconf.scr Fri Nov 27 16:28:42 2009 @@ -4,7 +4,7 @@ `ag_ini( `IniAgent("/etc/samba/smb.conf", $[ - "options" : [ "no_nested_sections", "ignore_case", "line_can_continue", "comments_last", "repeat_names" ], + "options" : [ "no_nested_sections", "ignore_case_regexps", "line_can_continue", "comments_last", "repeat_names" ], "comments": [ "^[ \t]*$", // empty line "^[ \t]+[;#].*$", // comment char is not first char Modified: trunk/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/package/yast2-samba… ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Fri Nov 27 16:28:42 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 24 10:51:19 CET 2009 - jsuchome(a)suse.cz + +- preserve case of keys in smb.conf (bnc#555579) +- 2.19.1 + +------------------------------------------------------------------- Thu Nov 19 09:43:02 CET 2009 - jsuchome(a)suse.cz - install pam_mount if necessary (bnc#552211) Modified: trunk/samba-client/src/SambaConfig.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/SambaConfig.pm?… ============================================================================== --- trunk/samba-client/src/SambaConfig.pm (original) +++ trunk/samba-client/src/SambaConfig.pm Fri Nov 27 16:28:42 2009 @@ -35,6 +35,8 @@ my %WinbindConfig; # configuration hash for /etc/security/pam_winbind.conf +my %OriginalKeys; # saving original names of smb.conf keys + ########################################################################### # global (static) variables (constants) @@ -171,6 +173,7 @@ # forget previous configuration %Config = (); + %OriginalKeys = (); # read the complete global section my $AllAtOnce = SCR->Read(".etc.smb.all"); @@ -193,16 +196,26 @@ next if $line->{kind} ne "value"; next if $line->{type} and not $section->{type}; # commented line - if (defined $Config{$share}{$line->{name}}) { - $self->ShareAddStr($share, $line->{name}, $line->{value}); + my $key = $line->{name}; + if ($key ne lc ($key)) { + # we are lowercasing keys later for simpler comparing, now save those + # which were not in lower case before + $OriginalKeys{$share} = {} if !defined $OriginalKeys{$share}; + $OriginalKeys{$share}{lc ($key)} = $key; + y2debug ("key $key not in lowercase"); + } + + if (defined $Config{$share}{$key}) { + $self->ShareAddStr($share, $key, $line->{value}); } else { - $self->ShareSetStr($share, $line->{name}, $line->{value}); + $self->ShareSetStr($share, $key, $line->{value}); } } } $self->UnsetModified(); y2debug ("Read config: ".Dumper(\%Config)); + y2debug ("original keys: ".Dumper(\%OriginalKeys)); # configuraton already read return 1 if not $forceReRead and %WinbindConfig; @@ -354,9 +367,12 @@ if (ref ($val) ne "ARRAY") { $val = [ String($val) ]; } - SCR->Write(".etc.smb.value.global.$key", $val); + # check if key was not changed on read + my $saved_key = $key; + $saved_key = $OriginalKeys{global}{$key} if defined $OriginalKeys{global}{$key}; + SCR->Write(".etc.smb.value.global.$saved_key", $val); # ensure option is not commented - SCR->Write(".etc.smb.value_type.global.$key", [Integer(0)]); + SCR->Write(".etc.smb.value_type.global.$saved_key", [Integer(0)]); } } @@ -393,8 +409,11 @@ if (ref ($val) ne "ARRAY") { $val = [ String($val) ]; } - my $ret1 = SCR->Write(".etc.smb.value.$share.$key", $val); - my $ret = SCR->Write(".etc.smb.value_type.$share.$key", [ Integer($commentout)]); + # check if key was not changed on read + my $saved_key = $key; + $saved_key = $OriginalKeys{$share}{$key} if defined $OriginalKeys{$share}{$key}; + my $ret1 = SCR->Write(".etc.smb.value.$share.$saved_key", $val); + my $ret = SCR->Write(".etc.smb.value_type.$share.$saved_key", [ Integer($commentout)]); } }; -- 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] r59831 - /tags/branch-Code-11-SP1-2_17_13/samba-client/
by jsuchome＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: jsuchome Date: Fri Nov 27 16:28:43 2009 New Revision: 59831 URL: http://svn.opensuse.org/viewcvs/yast?rev=59831&view=rev Log: Created tag branch-Code-11-SP1-2_17_13 for samba-client Added: tags/branch-Code-11-SP1-2_17_13/samba-client/ (props changed) - copied from r59829, branches/SuSE-Code-11-SP1-Branch/samba-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] r59829 - in /branches/SuSE-Code-11-SP1-Branch/samba-client: VERSION agents/cfg_smbconf.scr package/yast2-samba-client.changes src/SambaConfig.pm
by jsuchome＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: jsuchome Date: Fri Nov 27 16:28:31 2009 New Revision: 59829 URL: http://svn.opensuse.org/viewcvs/yast?rev=59829&view=rev Log: - preserve case of keys in smb.conf (bnc#555579) - 2.17.13 Modified: branches/SuSE-Code-11-SP1-Branch/samba-client/VERSION branches/SuSE-Code-11-SP1-Branch/samba-client/agents/cfg_smbconf.scr branches/SuSE-Code-11-SP1-Branch/samba-client/package/yast2-samba-client.changes branches/SuSE-Code-11-SP1-Branch/samba-client/src/SambaConfig.pm Modified: branches/SuSE-Code-11-SP1-Branch/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-client/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-client/VERSION Fri Nov 27 16:28:31 2009 @@ -1 +1 @@ -2.17.12 +2.17.13 Modified: branches/SuSE-Code-11-SP1-Branch/samba-client/agents/cfg_smbconf.scr URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-client/agents/cfg_smbconf.scr (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-client/agents/cfg_smbconf.scr Fri Nov 27 16:28:31 2009 @@ -4,7 +4,7 @@ `ag_ini( `IniAgent("/etc/samba/smb.conf", $[ - "options" : [ "no_nested_sections", "ignore_case", "line_can_continue", "comments_last", "repeat_names" ], + "options" : [ "no_nested_sections", "ignore_case_regexps", "line_can_continue", "comments_last", "repeat_names" ], "comments": [ "^[ \t]*$", // empty line "^[ \t]+[;#].*$", // comment char is not first char Modified: branches/SuSE-Code-11-SP1-Branch/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-client/package/yast2-samba-client.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-client/package/yast2-samba-client.changes Fri Nov 27 16:28:31 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 27 16:19:36 CET 2009 - jsuchome(a)suse.cz + +- preserve case of keys in smb.conf (bnc#555579) +- 2.17.13 + +------------------------------------------------------------------- Fri Jun 5 13:52:34 CEST 2009 - jsuchome(a)suse.cz - fixed architecture dependent packages for PPC (bnc#505263) Modified: branches/SuSE-Code-11-SP1-Branch/samba-client/src/SambaConfig.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-client/src/SambaConfig.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-client/src/SambaConfig.pm Fri Nov 27 16:28:31 2009 @@ -35,6 +35,8 @@ my %WinbindConfig; # configuration hash for /etc/security/pam_winbind.conf +my %OriginalKeys; # saving original names of smb.conf keys + ########################################################################### # global (static) variables (constants) @@ -171,6 +173,7 @@ # forget previous configuration %Config = (); + %OriginalKeys = (); # read the complete global section my $AllAtOnce = SCR->Read(".etc.smb.all"); @@ -193,16 +196,26 @@ next if $line->{kind} ne "value"; next if $line->{type} and not $section->{type}; # commented line - if (defined $Config{$share}{$line->{name}}) { - $self->ShareAddStr($share, $line->{name}, $line->{value}); + my $key = $line->{name}; + if ($key ne lc ($key)) { + # we are lowercasing keys later for simpler comparing, now save those + # which were not in lower case before + $OriginalKeys{$share} = {} if !defined $OriginalKeys{$share}; + $OriginalKeys{$share}{lc ($key)} = $key; + y2debug ("key $key not in lowercase"); + } + + if (defined $Config{$share}{$key}) { + $self->ShareAddStr($share, $key, $line->{value}); } else { - $self->ShareSetStr($share, $line->{name}, $line->{value}); + $self->ShareSetStr($share, $key, $line->{value}); } } } $self->UnsetModified(); y2debug ("Read config: ".Dumper(\%Config)); + y2debug ("original keys: ".Dumper(\%OriginalKeys)); # configuraton already read return 1 if not $forceReRead and %WinbindConfig; @@ -354,9 +367,12 @@ if (ref ($val) ne "ARRAY") { $val = [ String($val) ]; } - SCR->Write(".etc.smb.value.global.$key", $val); + # check if key was not changed on read + my $saved_key = $key; + $saved_key = $OriginalKeys{global}{$key} if defined $OriginalKeys{global}{$key}; + SCR->Write(".etc.smb.value.global.$saved_key", $val); # ensure option is not commented - SCR->Write(".etc.smb.value_type.global.$key", [Integer(0)]); + SCR->Write(".etc.smb.value_type.global.$saved_key", [Integer(0)]); } } @@ -393,8 +409,11 @@ if (ref ($val) ne "ARRAY") { $val = [ String($val) ]; } - my $ret1 = SCR->Write(".etc.smb.value.$share.$key", $val); - my $ret = SCR->Write(".etc.smb.value_type.$share.$key", [ Integer($commentout)]); + # check if key was not changed on read + my $saved_key = $key; + $saved_key = $OriginalKeys{$share}{$key} if defined $OriginalKeys{$share}{$key}; + my $ret1 = SCR->Write(".etc.smb.value.$share.$saved_key", $val); + my $ret = SCR->Write(".etc.smb.value_type.$share.$saved_key", [ Integer($commentout)]); } }; -- 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] r59828 - in /branches/SuSE-Code-11-SP1-Branch/storage: libstorage/src/DmmultipathCo.cc libstorage/src/DmmultipathCo.h package/yast2-storage.changes
by aschnell＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: aschnell Date: Fri Nov 27 16:18:18 2009 New Revision: 59828 URL: http://svn.opensuse.org/viewcvs/yast?rev=59828&view=rev Log: - adapted libstorage to change of multipath output Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/DmmultipathCo.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/DmmultipathCo.h branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/DmmultipathCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/DmmultipathCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/DmmultipathCo.cc Fri Nov 27 16:18:18 2009 @@ -39,6 +39,87 @@ using namespace storage; + CmdMultipath::CmdMultipath() + { + SystemCmd c(MULTIPATHBIN " -d -v 2+ -ll"); + if (c.retcode() != 0 || c.numLines() == 0) + return; + + vector<string> lines; + c.getStdout(lines); + vector<string>::const_iterator it1 = lines.begin(); + + while (it1 != lines.end()) + { + Entry entry; + + y2mil("mp line:" << *it1); + + string name = extractNthWord(0, *it1); + y2mil("mp name:" << name); + + list<string> tmp = splitString(extractNthWord(2, *it1, true), ","); + if (tmp.size() >= 2) + { + list<string>::const_iterator it2 = tmp.begin(); + entry.vendor = boost::trim_copy(*it2++, locale::classic()); + entry.model = boost::trim_copy(*it2++, locale::classic()); + } + + ++it1; + + if (it1 != lines.end()) + ++it1; + + while (it1 != lines.end()) + { + if (it1->empty() || isalnum((*it1)[0])) + break; + + if (boost::starts_with(*it1, "| `-") || boost::starts_with(*it1, " `-") || + boost::starts_with(*it1, " |-")) + { + string tmp = it1->substr(5); + y2mil("mp element:" << tmp); + string dev = "/dev/" + extractNthWord(1, tmp); + if (find(entry.devices.begin(), entry.devices.end(), dev) == entry.devices.end()) + entry.devices.push_back(dev); + } + + ++it1; + } + + data[name] = entry; + } + + for (const_iterator it = data.begin(); it != data.end(); ++it) + y2mil("data[" << it->first << "] -> vendor:" << it->second.vendor << + " model:" << it->second.model << " devices:" << it->second.devices); + } + + + list<string> + CmdMultipath::getEntries() const + { + list<string> ret; + for (const_iterator it = data.begin(); it != data.end(); ++it) + ret.push_back(it->first); + return ret; + } + + + bool + CmdMultipath::getEntry(const string& name, Entry& entry) const + { + const_iterator it = data.find(name); + if (it == data.end()) + return false; + + entry = it->second; + return true; + } + + DmmultipathCo::DmmultipathCo( Storage * const s, const string& Name, ProcPart& ppart ) : DmPartCo(s, "/dev/mapper/"+Name, staticType(), ppart ) { @@ -58,46 +139,15 @@ DmmultipathCo::getMultipathData(const string& name) { y2mil("name:" << name); - SystemCmd c(MULTIPATHBIN " -d -v 2+ -ll " + quote(name)); - if (c.numLines() > 0) + CmdMultipath::Entry entry; + if (CmdMultipath().getEntry(name, entry)) { - string line = *c.getLine(0); - y2mil("mp line:" << line); - - string unit = extractNthWord(0, line); - y2mil("mp name:" << unit); - - list<string> tmp = splitString(extractNthWord(2, line, true), ","); - if (tmp.size() >= 2) - { - list<string>::const_iterator it = tmp.begin(); - vendor = boost::trim_copy(*it++, locale::classic()); - model = boost::trim_copy(*it++, locale::classic()); - } - else - { - vendor = model = ""; - } - y2mil("vendor:" << vendor << " model:" << model); - - list<string> devs; - for (unsigned int i = 1; i < c.numLines(); i++) - { - string line = *c.getLine(i); - if (boost::starts_with(line, " \\_")) - { - y2mil("mp element:" << line); - string dev = getStorage()->deviceByNumber(extractNthWord(3,line)); - if (find(devs.begin(), devs.end(), dev) == devs.end()) - devs.push_back(dev); - } - } - - y2mil("devs:" << devs); + vendor = entry.vendor; + model = entry.model; Pv *pv = new Pv; - for (list<string>::const_iterator it = devs.begin(); it != devs.end(); it++) + for (list<string>::const_iterator it = entry.devices.begin(); it != entry.devices.end(); ++it) { pv->device = *it; addPv(pv); @@ -186,68 +236,26 @@ } -list<string> -DmmultipathCo::getMultipaths() -{ - list<string> l; - - SystemCmd c(MULTIPATHBIN " -d -v 2+ -ll"); - if (c.numLines() > 0) + list<string> + DmmultipathCo::getMultipaths() { - string line; - unsigned i=0; + list<string> l; - if( i<c.numLines() ) - line = *c.getLine(i); - while( i<c.numLines() ) + list<string> entries = CmdMultipath().getEntries(); + for (list<string>::const_iterator it = entries.begin(); it != entries.end(); ++it) { - while( i<c.numLines() && (line.empty() || !isalnum(line[0]))) - if( ++i<c.numLines() ) - line = *c.getLine(i); - - y2mil("mp line:" << line); - - string unit = extractNthWord(0, line); - y2mil("mp name:" << unit); - - list<string> mp_list; - - if( ++i<c.numLines() ) - line = *c.getLine(i); - while( i<c.numLines() && (line.empty() || !isalnum(line[0]))) - { - if (boost::starts_with(line, " \\_")) - { - y2mil( "mp element:" << line ); - string dev = extractNthWord(3,line); - if( find( mp_list.begin(), mp_list.end(), dev )== mp_list.end() ) - mp_list.push_back(dev); - } - if( ++i<c.numLines() ) - line = *c.getLine(i); - } - y2mil( "mp_list:" << mp_list ); - - if (mp_list.size() >= 1) - { - if (isActivated(unit)) - { - l.push_back(unit); - } - else - { - y2mil("ignoring inactive dmmultipath " << unit); - } - } + if (isActivated(*it)) + l.push_back(*it); + else + y2mil("ignoring inactive dmmultipath " << *it); } if (!l.empty()) active = true; - } - y2mil("detected multipaths " << l); - return l; -} + y2mil("detected multipaths " << l); + return l; + } string DmmultipathCo::setDiskLabelText( bool doing ) const Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/DmmultipathCo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/DmmultipathCo.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/DmmultipathCo.h Fri Nov 27 16:18:18 2009 @@ -30,12 +30,42 @@ namespace storage { + using std::map; + class Storage; class SystemCmd; class ProcPart; class Region; + + class CmdMultipath + { + + public: + + CmdMultipath(); + + struct Entry + { + string vendor; + string model; + list<string> devices; + }; + + list<string> getEntries() const; + + bool getEntry(const string& name, Entry& entry) const; + + private: + + typedef map<string, Entry>::const_iterator const_iterator; + + map<string, Entry> data; + + }; + + class DmmultipathCo : public DmPartCo { friend class Storage; Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Fri Nov 27 16:18:18 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 27 15:46:26 CET 2009 - aschnell(a)suse.de + +- adapted libstorage to change of multipath output + +------------------------------------------------------------------- Mon Nov 23 16:07:30 CET 2009 - aschnell(a)suse.de - improved mdadm.conf for IMSM (bnc #554142) -- 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] r59827 - /tags/branch-Code-11-SP1-2_17_24/ldap-server/
by rhafer＠svn.opensuse.org 27 Nov '09

27 Nov '09

Author: rhafer Date: Fri Nov 27 16:05:55 2009 New Revision: 59827 URL: http://svn.opensuse.org/viewcvs/yast?rev=59827&view=rev Log: Created tag branch-Code-11-SP1-2_17_24 for ldap-server Added: tags/branch-Code-11-SP1-2_17_24/ldap-server/ (props changed) - copied from r59826, branches/SuSE-Code-11-SP1-Branch/ldap-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0