December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60143 - in /branches/SuSE-Code-11-SP1-Branch/ncurses: VERSION package/yast2-ncurses.changes src/NCPad.cc src/NCPad.h src/NCTablePad.cc src/NCTablePad.h src/ncursesw.h
by mlandres＠svn.opensuse.org 18 Dec '09

18 Dec '09

Author: mlandres Date: Fri Dec 18 11:31:22 2009 New Revision: 60143 URL: http://svn.opensuse.org/viewcvs/yast?rev=60143&view=rev Log: Work around 32768 lines limit in ncurses table. (bnc #550733) Modified: branches/SuSE-Code-11-SP1-Branch/ncurses/VERSION branches/SuSE-Code-11-SP1-Branch/ncurses/package/yast2-ncurses.changes branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCPad.cc branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCPad.h branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCTablePad.cc branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCTablePad.h branches/SuSE-Code-11-SP1-Branch/ncurses/src/ncursesw.h Modified: branches/SuSE-Code-11-SP1-Branch/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses/VERSION Fri Dec 18 11:31:22 2009 @@ -1 +1 @@ -2.17.16 +2.17.17 Modified: branches/SuSE-Code-11-SP1-Branch/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses/package/yast2-ncurses.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses/package/yast2-ncurses.changes Fri Dec 18 11:31:22 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Dec 18 10:48:05 CET 2009 - ma(a)suse.de + +- Work around 32768 lines limit in ncurses table. (bnc #550733) +- V 2.17.17 + +------------------------------------------------------------------- Tue Mar 31 11:42:44 CEST 2009 - gs(a)suse.de - Bugfix for IntField widget: draw the value correctly (was hidden Modified: branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCPad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCPad.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCPad.cc Fri Dec 18 11:31:22 2009 @@ -20,6 +20,29 @@ #include <YUILog.h> #include "NCPad.h" +/////////////////////////////////////////////////////////////////// + +// 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() + + +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 ) +{} + void NCPad::Destwin( NCursesWindow * dwin ) { @@ -29,9 +52,9 @@ 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; @@ -52,7 +75,7 @@ { SetPadSize( nsze ); // might be enlarged by NCPadWidget if redirected - if ( nsze.H != height() + if ( nsze.H != vheight() || nsze.W != width() ) { NCursesWindow * odest = Destwin(); @@ -60,7 +83,19 @@ if ( odest ) Destwin( 0 ); + if ( nsze.H > MAX_PAD_HEIGHT ) + { + yuiDebug() << "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; + } + + yuiDebug() << "Pageing ?: " << pageing() << endl; if ( odest ) Destwin( odest ); @@ -89,6 +124,8 @@ updateScrollHint(); + if ( ! pageing() ) + { return copywin( *destwin, srect.Pos.L, srect.Pos.C, drect.Pos.L, drect.Pos.C, @@ -96,6 +133,19 @@ 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, + 0, srect.Pos.C, + drect.Pos.L, drect.Pos.C, + maxdpos.L, maxdpos.C, + false ); + } return OK; } @@ -128,7 +178,7 @@ break; case KEY_HOME: - ScrlUp( maxy() ); + ScrlUp( vheight() ); break; case KEY_DOWN: @@ -140,7 +190,7 @@ break; case KEY_END: - ScrlDown( maxy() ); + ScrlDown( vheight() ); break; case KEY_LEFT: Modified: branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCPad.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCPad.h (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCPad.h Fri Dec 18 11:31:22 2009 @@ -86,6 +86,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; @@ -99,6 +116,11 @@ 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; } virtual int dirtyPad() { dirty = false; return setpos( CurPos() ); } @@ -111,18 +133,20 @@ virtual void updateScrollHint(); -public: + /** 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 ) {} - NCPad( int lines, int cols, const NCWidget & p ) - : NCursesPad( lines, cols ) - , parw( p ) - , destwin( 0 ) - , maxdpos( 0 ) - , maxspos( 0 ) - , dclear( false ) - , dirty( false ) - {} +public: + NCPad( int lines, int cols, const NCWidget & p ); virtual ~NCPad() {} public: Modified: branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCTablePad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCTablePad.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCTablePad.cc Fri Dec 18 11:31:22 2009 @@ -206,11 +206,15 @@ wsze lSze( 1, width() ); + 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() ); @@ -229,6 +233,16 @@ +void NCTablePad::directDraw( NCursesWindow & w, const wrect at, unsigned lineno ) +{ + if ( lineno < Lines() ) + Items[lineno]->DrawAt( w, at, ItemStyle, ((unsigned)citem.L == lineno) ); + else + yuiWarning() << "Illegal Lineno " << lineno << " (" << Lines() << ")" << endl; +} + + + int NCTablePad::setpos( const wpos & newpos ) { if ( !Lines() ) @@ -264,6 +278,8 @@ return DoRedraw(); } + if ( ! pageing() ) + { // adjust only if ( citem.L != oitem ) { @@ -274,6 +290,8 @@ 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-Code-11-SP1-Branch/ncurses/src/NCTablePad.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCTablePad.h (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses/src/NCTablePad.h Fri Dec 18 11:31:22 2009 @@ -107,6 +107,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 ); Modified: branches/SuSE-Code-11-SP1-Branch/ncurses/src/ncursesw.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ncurses/src/ncursesw.h (original) +++ branches/SuSE-Code-11-SP1-Branch/ncurses/src/ncursesw.h Fri Dec 18 11:31:22 2009 @@ -24,6 +24,7 @@ #include <ncursesw/etip.h> #include <cstdio> #include <cstdarg> +#include <climits> #include "position.h" #include <ncursesw/curses.h> @@ -887,6 +888,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. */ @@ -1084,6 +1088,8 @@ */ int maxy() const { return getmaxy(w) == ERR ? ERR : getmaxy(w)-1; } + /** Ncurses up to ncurses5 internally uses \c short. */ + static int maxcoord() { return ncursesMaxCoord<NCURSES_SIZE_T>(); } wsze size() const { return wsze( height(), width() ); } -- 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] r60142 - /tags/branch-Code-11-2_17_17/ncurses/
by mlandres＠svn.opensuse.org 18 Dec '09

18 Dec '09

Author: mlandres Date: Fri Dec 18 11:15:54 2009 New Revision: 60142 URL: http://svn.opensuse.org/viewcvs/yast?rev=60142&view=rev Log: Created tag branch-Code-11-2_17_17 for ncurses Added: tags/branch-Code-11-2_17_17/ncurses/ - copied from r60141, branches/SuSE-Code-11-Branch/ncurses/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60141 - in /branches/SuSE-Code-11-Branch/ncurses: VERSION package/yast2-ncurses.changes src/NCPad.cc src/NCPad.h src/NCTablePad.cc src/NCTablePad.h src/ncursesw.h
by mlandres＠svn.opensuse.org 18 Dec '09

18 Dec '09

Author: mlandres Date: Fri Dec 18 11:15:13 2009 New Revision: 60141 URL: http://svn.opensuse.org/viewcvs/yast?rev=60141&view=rev Log: Work around 32768 lines limit in ncurses table. (bnc #550733) Modified: branches/SuSE-Code-11-Branch/ncurses/VERSION branches/SuSE-Code-11-Branch/ncurses/package/yast2-ncurses.changes branches/SuSE-Code-11-Branch/ncurses/src/NCPad.cc branches/SuSE-Code-11-Branch/ncurses/src/NCPad.h branches/SuSE-Code-11-Branch/ncurses/src/NCTablePad.cc branches/SuSE-Code-11-Branch/ncurses/src/NCTablePad.h branches/SuSE-Code-11-Branch/ncurses/src/ncursesw.h Modified: branches/SuSE-Code-11-Branch/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ncurses/V… ============================================================================== --- branches/SuSE-Code-11-Branch/ncurses/VERSION (original) +++ branches/SuSE-Code-11-Branch/ncurses/VERSION Fri Dec 18 11:15:13 2009 @@ -1 +1 @@ -2.17.16 +2.17.17 Modified: branches/SuSE-Code-11-Branch/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ncurses/p… ============================================================================== --- branches/SuSE-Code-11-Branch/ncurses/package/yast2-ncurses.changes (original) +++ branches/SuSE-Code-11-Branch/ncurses/package/yast2-ncurses.changes Fri Dec 18 11:15:13 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Dec 18 10:48:05 CET 2009 - ma(a)suse.de + +- Work around 32768 lines limit in ncurses table. (bnc #550733) +- V 2.17.17 + +------------------------------------------------------------------- Tue Mar 31 11:42:44 CEST 2009 - gs(a)suse.de - Bugfix for IntField widget: draw the value correctly (was hidden Modified: branches/SuSE-Code-11-Branch/ncurses/src/NCPad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ncurses/s… ============================================================================== --- branches/SuSE-Code-11-Branch/ncurses/src/NCPad.cc (original) +++ branches/SuSE-Code-11-Branch/ncurses/src/NCPad.cc Fri Dec 18 11:15:13 2009 @@ -20,6 +20,29 @@ #include <YUILog.h> #include "NCPad.h" +/////////////////////////////////////////////////////////////////// + +// 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() + + +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 ) +{} + void NCPad::Destwin( NCursesWindow * dwin ) { @@ -29,9 +52,9 @@ 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; @@ -52,7 +75,7 @@ { SetPadSize( nsze ); // might be enlarged by NCPadWidget if redirected - if ( nsze.H != height() + if ( nsze.H != vheight() || nsze.W != width() ) { NCursesWindow * odest = Destwin(); @@ -60,7 +83,19 @@ if ( odest ) Destwin( 0 ); - NCursesPad::resize( nsze.H, nsze.W ); + if ( nsze.H > MAX_PAD_HEIGHT ) + { + yuiDebug() << "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; + } + + yuiDebug() << "Pageing ?: " << pageing() << endl; if ( odest ) Destwin( odest ); @@ -89,13 +124,28 @@ updateScrollHint(); - return copywin( *destwin, - srect.Pos.L, srect.Pos.C, - drect.Pos.L, drect.Pos.C, - maxdpos.L, maxdpos.C, - false ); + 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, + 0, srect.Pos.C, + drect.Pos.L, drect.Pos.C, + maxdpos.L, maxdpos.C, + false ); } - return OK; } @@ -128,7 +178,7 @@ break; case KEY_HOME: - ScrlUp( maxy() ); + ScrlUp( vheight() ); break; case KEY_DOWN: @@ -140,7 +190,7 @@ break; case KEY_END: - ScrlDown( maxy() ); + ScrlDown( vheight() ); break; case KEY_LEFT: Modified: branches/SuSE-Code-11-Branch/ncurses/src/NCPad.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ncurses/s… ============================================================================== --- branches/SuSE-Code-11-Branch/ncurses/src/NCPad.h (original) +++ branches/SuSE-Code-11-Branch/ncurses/src/NCPad.h Fri Dec 18 11:15:13 2009 @@ -86,6 +86,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; @@ -99,7 +116,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; } + virtual int dirtyPad() { dirty = false; return setpos( CurPos() ); } virtual int setpos( const wpos & newpos ); @@ -111,18 +133,20 @@ virtual void updateScrollHint(); -public: + /** 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 ) {} - NCPad( int lines, int cols, const NCWidget & p ) - : NCursesPad( lines, cols ) - , parw( p ) - , destwin( 0 ) - , maxdpos( 0 ) - , maxspos( 0 ) - , dclear( false ) - , dirty( false ) - {} +public: + NCPad( int lines, int cols, const NCWidget & p ); virtual ~NCPad() {} public: Modified: branches/SuSE-Code-11-Branch/ncurses/src/NCTablePad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ncurses/s… ============================================================================== --- branches/SuSE-Code-11-Branch/ncurses/src/NCTablePad.cc (original) +++ branches/SuSE-Code-11-Branch/ncurses/src/NCTablePad.cc Fri Dec 18 11:15:13 2009 @@ -206,11 +206,15 @@ wsze lSze( 1, width() ); - for ( unsigned l = 0; l < Lines(); ++l ) + if ( ! pageing() ) { - Items[l]->DrawAt( *this, wrect( wpos( l, 0 ), lSze ), - ItemStyle, (( unsigned )citem.L == l ) ); + 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() ); @@ -229,6 +233,16 @@ +void NCTablePad::directDraw( NCursesWindow & w, const wrect at, unsigned lineno ) +{ + if ( lineno < Lines() ) + Items[lineno]->DrawAt( w, at, ItemStyle, ((unsigned)citem.L == lineno) ); + else + yuiWarning() << "Illegal Lineno " << lineno << " (" << Lines() << ")" << endl; +} + + + int NCTablePad::setpos( const wpos & newpos ) { if ( !Lines() ) @@ -264,16 +278,20 @@ return DoRedraw(); } - // adjust only - if ( citem.L != oitem ) + if ( ! pageing() ) { - Items[oitem]->DrawAt( *this, wrect( wpos( oitem, 0 ), wsze( 1, width() ) ), - ItemStyle, false ); - } + // 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() ) ), + Items[citem.L]->DrawAt( *this, wrect( wpos( citem.L, 0 ), wsze( 1, width() ) ), - ItemStyle, true ); + ItemStyle, true ); + } + // else: item drawing requested via directDraw if ( srect.Pos.C != opos ) SendHead(); Modified: branches/SuSE-Code-11-Branch/ncurses/src/NCTablePad.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ncurses/s… ============================================================================== --- branches/SuSE-Code-11-Branch/ncurses/src/NCTablePad.h (original) +++ branches/SuSE-Code-11-Branch/ncurses/src/NCTablePad.h Fri Dec 18 11:15:13 2009 @@ -107,6 +107,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 ); Modified: branches/SuSE-Code-11-Branch/ncurses/src/ncursesw.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ncurses/s… ============================================================================== --- branches/SuSE-Code-11-Branch/ncurses/src/ncursesw.h (original) +++ branches/SuSE-Code-11-Branch/ncurses/src/ncursesw.h Fri Dec 18 11:15:13 2009 @@ -24,6 +24,7 @@ #include <ncursesw/etip.h> #include <cstdio> #include <cstdarg> +#include <climits> #include "position.h" #include <ncursesw/curses.h> @@ -887,6 +888,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. */ @@ -1084,6 +1088,8 @@ */ int maxy() const { return getmaxy(w) == ERR ? ERR : getmaxy(w)-1; } + /** Ncurses up to ncurses5 internally uses \c short. */ + static int maxcoord() { return ncursesMaxCoord<NCURSES_SIZE_T>(); } wsze size() const { return wsze( height(), width() ); } @@ -1803,7 +1809,7 @@ /** * Constructor. - * + * * If 'absrel' is 'a', begin_x/y are absolute screen pos, * else if 'r', they are relative to par origin */ -- 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] <rest-service> backgroud_patches_bnc550934 : testsuite update
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit cf8abb9c2f7d0b2a1ecf9c4e26e817cb00a67bef Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Dec 18 10:04:23 2009 +0100 testsuite update --- webservice/test/unit/background_manager_test.rb | 4 ++++ webservice/test/unit/background_status_test.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/webservice/test/unit/background_manager_test.rb b/webservice/test/unit/background_manager_test.rb index 81f0b39..61a88cf 100644 --- a/webservice/test/unit/background_manager_test.rb +++ b/webservice/test/unit/background_manager_test.rb @@ -20,10 +20,14 @@ class BackgroundManagerTest < ActiveSupport::TestCase @bm.update_progress(:dummy) assert_equal nil, @bm.get_progress(:dummy) + changed = false @bm.update_progress(:dummy) do |s| + # this block must NOT be executed s.progress = 10 + changed = true end assert_equal nil, @bm.get_progress(:dummy) + assert !changed # register a process diff --git a/webservice/test/unit/background_status_test.rb b/webservice/test/unit/background_status_test.rb index 2131fa7..c63b93d 100644 --- a/webservice/test/unit/background_status_test.rb +++ b/webservice/test/unit/background_status_test.rb @@ -38,7 +38,7 @@ class BackgroundStatusTest < ActiveSupport::TestCase end def test_observing - ot = ObserverTest.new(@bs, changed_flag) + ot = ObserverTest.new(@bs) s = 'dummy status' p = 10 sp = 5 -- 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] <rest-service> backgroud_patches_bnc550934 : added BackgroundStatus test suite
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 50b3749636edaddde03ac59c4da2ef140dc03752 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Dec 18 09:44:39 2009 +0100 added BackgroundStatus test suite --- webservice/test/unit/background_status_test.rb | 81 ++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/webservice/test/unit/background_status_test.rb b/webservice/test/unit/background_status_test.rb new file mode 100644 index 0000000..2131fa7 --- /dev/null +++ b/webservice/test/unit/background_status_test.rb @@ -0,0 +1,81 @@ +require File.dirname(__FILE__) + '/../test_helper' + +class ObserverTest + def initialize(observable) + observable.add_observer(self) + reset + end + + def update(observable) + @changed = true + end + + def changed? + @changed + end + + def reset + @changed = false + end +end + +class BackgroundStatusTest < ActiveSupport::TestCase + def setup + @bs = BackgroundStatus.new + end + + def test_assignemnt + s = 'status' + p = 10 + sp = 5 + @bs.status = s + @bs.progress = p + @bs.subprogress = sp + + assert_equal s, @bs.status + assert_equal p, @bs.progress + assert_equal sp, @bs.subprogress + end + + def test_observing + ot = ObserverTest.new(@bs, changed_flag) + s = 'dummy status' + p = 10 + sp = 5 + + # test progress change + ot.reset + @bs.progress = p + assert ot.changed? + + ot.reset + @bs.subprogress = sp + assert ot.changed? + + ot.reset + @bs.status = s + assert ot.changed? + + # no change must not emit change event + ot.reset + @bs.progress = p + assert !ot.changed? + + ot.reset + @bs.subprogress = sp + assert !ot.changed? + + ot.reset + @bs.status = s + assert !ot.changed? + end + + def test_serialization + assert @bs.to_xml + + expected_ret = {"subprogress" => @bs.subprogress, "progress" => @bs.progress, "status" => @bs.status } + + assert_equal expected_ret, Hash.from_xml((a)bs.to_xml)["background_status"] + end + +end -- 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] <rest-service> backgroud_patches_bnc550934 : added BackgroundManager testsuite
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 99b5247aa66622b578aac0d4ad21a6ed619467e0 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Dec 18 09:44:03 2009 +0100 added BackgroundManager testsuite --- webservice/test/unit/background_manager_test.rb | 77 +++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/webservice/test/unit/background_manager_test.rb b/webservice/test/unit/background_manager_test.rb new file mode 100644 index 0000000..81f0b39 --- /dev/null +++ b/webservice/test/unit/background_manager_test.rb @@ -0,0 +1,77 @@ +require File.dirname(__FILE__) + '/../test_helper' + +class BackgroundManagerTest < ActiveSupport::TestCase + def setup + @bm = BackgroundManager.instance + end + + def test_instance_not_nil + assert_not_equal nil, @bm + end + + def test_background_manager + + # no background progress created yet + assert !@bm.process_running?(:dummy) + assert !@bm.process_finished?(:dummy) + assert_equal nil, @bm.get_progress(:dummy) + assert_equal nil, @bm.get_value(:dummy) + + @bm.update_progress(:dummy) + assert_equal nil, @bm.get_progress(:dummy) + + @bm.update_progress(:dummy) do |s| + s.progress = 10 + end + assert_equal nil, @bm.get_progress(:dummy) + + + # register a process + @bm.add_process(:test) + + assert @bm.process_running?(:test) + assert !@bm.process_finished?(:test) + assert_not_equal nil, @bm.get_progress(:test) + assert_equal 0, @bm.get_progress(:test).progress + assert_equal nil, @bm.get_value(:test) + + + # update progress + pr = 42 + sp = 10 + st = 'testing' + @bm.update_progress(:test) do |p| + p.status = st + p.progress = pr + p.subprogress = sp + end + + assert @bm.process_running?(:test) + assert !@bm.process_finished?(:test) + assert_not_equal nil, @bm.get_progress(:test) + assert_equal st, @bm.get_progress(:test).status + assert_equal pr, @bm.get_progress(:test).progress + assert_equal sp, @bm.get_progress(:test).subprogress + assert_equal nil, @bm.get_value(:test) + + + # finish the process, set a final value + final_value = 'final_value' + @bm.finish_process(:test, final_value) + assert !@bm.process_running?(:test) + assert @bm.process_finished?(:test) + assert_equal nil, @bm.get_progress(:test) + assert_equal final_value, @bm.get_value(:test) + + + # the result is removed after reading + assert_equal nil, @bm.get_value(:test) + assert !@bm.process_running?(:test) + assert !@bm.process_finished?(:test) + + # check the config call + assert_equal Rails.configuration.cache_classes, @bm.background_enabled? + end + + +end -- 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] r60140 - in /trunk/storage/storage/src/testsuite: run/ tests/
by aschnell＠svn.opensuse.org 17 Dec '09

17 Dec '09

Author: aschnell Date: Thu Dec 17 16:09:14 2009 New Revision: 60140 URL: http://svn.opensuse.org/viewcvs/yast?rev=60140&view=rev Log: - used "testedfiles:" feature Modified: trunk/storage/storage/src/testsuite/run/runtest.sh trunk/storage/storage/src/testsuite/tests/empty1.out trunk/storage/storage/src/testsuite/tests/empty1.ycp trunk/storage/storage/src/testsuite/tests/empty2.out trunk/storage/storage/src/testsuite/tests/empty2.ycp trunk/storage/storage/src/testsuite/tests/empty3.out trunk/storage/storage/src/testsuite/tests/empty3.ycp trunk/storage/storage/src/testsuite/tests/empty4.out trunk/storage/storage/src/testsuite/tests/empty4.ycp trunk/storage/storage/src/testsuite/tests/empty5.out trunk/storage/storage/src/testsuite/tests/empty5.ycp trunk/storage/storage/src/testsuite/tests/empty6.out trunk/storage/storage/src/testsuite/tests/empty6.ycp trunk/storage/storage/src/testsuite/tests/half-empty1.out trunk/storage/storage/src/testsuite/tests/half-empty1.ycp trunk/storage/storage/src/testsuite/tests/reuse-home1.out trunk/storage/storage/src/testsuite/tests/reuse-home1.ycp trunk/storage/storage/src/testsuite/tests/windows-only1.out trunk/storage/storage/src/testsuite/tests/windows-only1.ycp trunk/storage/storage/src/testsuite/tests/windows1.out trunk/storage/storage/src/testsuite/tests/windows1.ycp Modified: trunk/storage/storage/src/testsuite/run/runtest.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/ru… ============================================================================== --- trunk/storage/storage/src/testsuite/run/runtest.sh (original) +++ trunk/storage/storage/src/testsuite/run/runtest.sh Thu Dec 17 16:09:14 2009 @@ -77,11 +77,7 @@ rm -f "$file" } -dump_only() { - grep -E "^Dump" | sed "s/^Dump\t//" -} - -( $Y2BASE -l - -c "$logconf" $OPTIONS "$1" UI 2>&1 ) | parse | dump_only >"$2" 2>"$3" +( $Y2BASE -l - -c "$logconf" $OPTIONS "$1" UI 2>&1 ) | parse >"$2" 2>"$3" retcode="$PIPESTATUS" if [ "$retcode" -gt 0 ]; then Modified: trunk/storage/storage/src/testsuite/tests/empty1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty1.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty1.out Thu Dec 17 16:09:14 2009 @@ -1,3 +1,3 @@ -Proposal: -Create swap partition /dev/sda1 (517.72 MB) -Create root partition /dev/sda2 (297.58 GB) with ext4 +Dump Proposal: +Dump Create swap partition /dev/sda1 (517.72 MB) +Dump Create root partition /dev/sda2 (297.58 GB) with ext4 Modified: trunk/storage/storage/src/testsuite/tests/empty1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty1.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/empty2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty2.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty2.out Thu Dec 17 16:09:14 2009 @@ -1,4 +1,4 @@ -Proposal: -Create swap partition /dev/sda1 (2.01 GB) -Create root partition /dev/sda2 (20.00 GB) with ext4 -Create partition /dev/sda3 (276.08 GB) for /home with ext4 +Dump Proposal: +Dump Create swap partition /dev/sda1 (2.01 GB) +Dump Create root partition /dev/sda2 (20.00 GB) with ext4 +Dump Create partition /dev/sda3 (276.08 GB) for /home with ext4 Modified: trunk/storage/storage/src/testsuite/tests/empty2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty2.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty2.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/empty3.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty3.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty3.out Thu Dec 17 16:09:14 2009 @@ -1,6 +1,6 @@ -Proposal: -Create boot partition /dev/sda1 (70.60 MB) with ext4 -Create partition /dev/sda2 (29.99 GB) with id=8E -Create volume group system from /dev/sda2 [destructive] -Create logical volume /dev/system/root (10.00 GB) for / with ext4 -Create swap logical volume /dev/system/swap (512.00 MB) +Dump Proposal: +Dump Create boot partition /dev/sda1 (70.60 MB) with ext4 +Dump Create partition /dev/sda2 (29.99 GB) with id=8E +Dump Create volume group system from /dev/sda2 [destructive] +Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 +Dump Create swap logical volume /dev/system/swap (512.00 MB) Modified: trunk/storage/storage/src/testsuite/tests/empty3.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty3.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty3.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/empty4.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty4.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty4.out Thu Dec 17 16:09:14 2009 @@ -1,7 +1,7 @@ -Proposal: -Create boot partition /dev/sda1 (70.60 MB) with ext4 -Create partition /dev/sda2 (29.99 GB) with id=8E -Create volume group system from /dev/sda2 [destructive] -Create logical volume /dev/system/home (19.49 GB) for /home with ext4 -Create logical volume /dev/system/root (10.00 GB) for / with ext4 -Create swap logical volume /dev/system/swap (512.00 MB) +Dump Proposal: +Dump Create boot partition /dev/sda1 (70.60 MB) with ext4 +Dump Create partition /dev/sda2 (29.99 GB) with id=8E +Dump Create volume group system from /dev/sda2 [destructive] +Dump Create logical volume /dev/system/home (19.49 GB) for /home with ext4 +Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 +Dump Create swap logical volume /dev/system/swap (512.00 MB) Modified: trunk/storage/storage/src/testsuite/tests/empty4.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty4.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty4.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/empty5.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty5.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty5.out Thu Dec 17 16:09:14 2009 @@ -1,6 +1,6 @@ -Proposal: -Create boot partition /dev/sda1 (70.60 MB) with ext4 -Create partition /dev/sda2 (298.02 GB) with id=8E -Create volume group system from /dev/sda2 [destructive] -Create logical volume /dev/system/root (10.00 GB) for / with ext4 -Create swap logical volume /dev/system/swap (768.00 MB) +Dump Proposal: +Dump Create boot partition /dev/sda1 (70.60 MB) with ext4 +Dump Create partition /dev/sda2 (298.02 GB) with id=8E +Dump Create volume group system from /dev/sda2 [destructive] +Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 +Dump Create swap logical volume /dev/system/swap (768.00 MB) Modified: trunk/storage/storage/src/testsuite/tests/empty5.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty5.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty5.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/empty6.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty6.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty6.out Thu Dec 17 16:09:14 2009 @@ -1,7 +1,7 @@ -Proposal: -Create boot partition /dev/sda1 (70.60 MB) with ext4 -Create partition /dev/sda2 (298.02 GB) with id=8E -Create volume group system from /dev/sda2 [destructive] -Create logical volume /dev/system/home (25.00 GB) for /home with ext4 -Create logical volume /dev/system/root (10.00 GB) for / with ext4 -Create swap logical volume /dev/system/swap (768.00 MB) +Dump Proposal: +Dump Create boot partition /dev/sda1 (70.60 MB) with ext4 +Dump Create partition /dev/sda2 (298.02 GB) with id=8E +Dump Create volume group system from /dev/sda2 [destructive] +Dump Create logical volume /dev/system/home (25.00 GB) for /home with ext4 +Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 +Dump Create swap logical volume /dev/system/swap (768.00 MB) Modified: trunk/storage/storage/src/testsuite/tests/empty6.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty6.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty6.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/half-empty1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/half-empty1.out (original) +++ trunk/storage/storage/src/testsuite/tests/half-empty1.out Thu Dec 17 16:09:14 2009 @@ -1,5 +1,5 @@ -Proposal: -Create extended partition /dev/sda3 (147.09 GB) -Create swap partition /dev/sda5 (2.01 GB) -Create root partition /dev/sda6 (20.00 GB) with ext4 -Create partition /dev/sda7 (125.08 GB) for /home with ext4 +Dump Proposal: +Dump Create extended partition /dev/sda3 (147.09 GB) +Dump Create swap partition /dev/sda5 (2.01 GB) +Dump Create root partition /dev/sda6 (20.00 GB) with ext4 +Dump Create partition /dev/sda7 (125.08 GB) for /home with ext4 Modified: trunk/storage/storage/src/testsuite/tests/half-empty1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/half-empty1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/half-empty1.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/reuse-home1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/reuse-home1.out (original) +++ trunk/storage/storage/src/testsuite/tests/reuse-home1.out Thu Dec 17 16:09:14 2009 @@ -1,4 +1,4 @@ -Proposal: -Format partition /dev/sda2 (15.01 GB) for / with ext4 [destructive] -Use /dev/sda1 as swap -Set mount point of /dev/sda3 to /home +Dump Proposal: +Dump Format partition /dev/sda2 (15.01 GB) for / with ext4 [destructive] +Dump Use /dev/sda1 as swap +Dump Set mount point of /dev/sda3 to /home Modified: trunk/storage/storage/src/testsuite/tests/reuse-home1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/reuse-home1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/reuse-home1.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/windows-only1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/windows-only1.out (original) +++ trunk/storage/storage/src/testsuite/tests/windows-only1.out Thu Dec 17 16:09:14 2009 @@ -1,6 +1,6 @@ -Proposal: -Shrink Windows partition /dev/sda1 to 33.21 GB [destructive] -Create extended partition /dev/sda2 (41.32 GB) -Create swap partition /dev/sda5 (517.72 MB) -Create root partition /dev/sda6 (16.50 GB) with ext4 -Create partition /dev/sda7 (24.31 GB) for /home with ext4 +Dump Proposal: +Dump Shrink Windows partition /dev/sda1 to 33.21 GB [destructive] +Dump Create extended partition /dev/sda2 (41.32 GB) +Dump Create swap partition /dev/sda5 (517.72 MB) +Dump Create root partition /dev/sda6 (16.50 GB) with ext4 +Dump Create partition /dev/sda7 (24.31 GB) for /home with ext4 Modified: trunk/storage/storage/src/testsuite/tests/windows-only1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/windows-only1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/windows-only1.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/windows1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/windows1.out (original) +++ trunk/storage/storage/src/testsuite/tests/windows1.out Thu Dec 17 16:09:14 2009 @@ -1,6 +1,6 @@ -Proposal: -Create extended partition /dev/sda2 (34.52 GB) -Create swap partition /dev/sda5 (517.72 MB) -Create root partition /dev/sda6 (15.01 GB) with ext4 -Create partition /dev/sda7 (19.01 GB) for /home with ext4 -Set mount point of /dev/sda1 to /windows/C +Dump Proposal: +Dump Create extended partition /dev/sda2 (34.52 GB) +Dump Create swap partition /dev/sda5 (517.72 MB) +Dump Create root partition /dev/sda6 (15.01 GB) with ext4 +Dump Create partition /dev/sda7 (19.01 GB) for /home with ext4 +Dump Set mount point of /dev/sda1 to /windows/C Modified: trunk/storage/storage/src/testsuite/tests/windows1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/windows1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/windows1.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; -- 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] r60139 - /tags/branch-SLE-10-SP2-2_13_119_3/network/
by mzugec＠svn.opensuse.org 17 Dec '09

17 Dec '09

Author: mzugec Date: Thu Dec 17 15:55:40 2009 New Revision: 60139 URL: http://svn.opensuse.org/viewcvs/yast?rev=60139&view=rev Log: Created tag branch-SLE-10-SP2-2_13_119_3 for network Added: tags/branch-SLE-10-SP2-2_13_119_3/network/ - copied from r60138, branches/SuSE-SLE-10-SP2-Branch/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] r60138 - /tags/branch-SLE-10-SP2-2_13_119_3/
by mzugec＠svn.opensuse.org 17 Dec '09

17 Dec '09

Author: mzugec Date: Thu Dec 17 15:55:37 2009 New Revision: 60138 URL: http://svn.opensuse.org/viewcvs/yast?rev=60138&view=rev Log: Created tag branch-SLE-10-SP2-2_13_119_3 Added: tags/branch-SLE-10-SP2-2_13_119_3/ -- 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] r60137 - in /branches/SuSE-SLE-10-SP2-Branch/network: VERSION package/yast2-network.changes src/modules/Lan.ycp
by mzugec＠svn.opensuse.org 17 Dec '09

17 Dec '09

Author: mzugec Date: Thu Dec 17 15:55:30 2009 New Revision: 60137 URL: http://svn.opensuse.org/viewcvs/yast?rev=60137&view=rev Log: resolv.conf not updated when switch from dhcp->static (bnc#561349) Modified: branches/SuSE-SLE-10-SP2-Branch/network/VERSION branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes branches/SuSE-SLE-10-SP2-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/network/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/network/VERSION Thu Dec 17 15:55:30 2009 @@ -1 +1 @@ -2.13.119.2 +2.13.119.3 Modified: branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes Thu Dec 17 15:55:30 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Dec 17 15:23:39 CET 2009 - mzugec(a)suse.de + +- resolv.conf not updated when switch from dhcp->static (bnc#561349) +- 2.13.119.3 + +------------------------------------------------------------------- Thu Nov 5 11:47:26 CET 2009 - mzugec(a)suse.de - Do a proper reload of network service on writing (standalone) DNS Modified: branches/SuSE-SLE-10-SP2-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/network/src/modules/Lan.ycp Thu Dec 17 15:55:30 2009 @@ -550,7 +550,12 @@ if(Abort()) return false; /* Progress step 6 */ ProgressNextStage(_("Writing hostname and DNS configuration...")); + // write resolv.conf after change from dhcp to static (bnc#327074) + // and (bnc#561349) + NetworkService::StartStop (); + y2milestone("resolv.conf:%1", SCR::Read(.target.string, "/etc/resolv.conf")); DNS::Write(); + y2milestone("resolv.conf:%1", SCR::Read(.target.string, "/etc/resolv.conf")); Host::Write(); sleep(sl); @@ -574,7 +579,12 @@ /* Progress step 9 */ ProgressNextStage(_("Activating network services...")); NetworkModules::HwUp (); + y2milestone("resolv.conf:%1", SCR::Read(.target.string, "/etc/resolv.conf")); NetworkService::StartStop (); + y2milestone("resolv.conf:%1", SCR::Read(.target.string, "/etc/resolv.conf")); + DNS::modified=true; + DNS::Write(); + y2milestone("resolv.conf:%1", SCR::Read(.target.string, "/etc/resolv.conf")); sleep(sl); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0