February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55795 - /branches/SuSE-Code-11-Branch/doc/_build-www.sh
by locilka＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: locilka Date: Thu Feb 26 15:59:29 2009 New Revision: 55795 URL: http://svn.opensuse.org/viewcvs/yast?rev=55795&view=rev Log: Using package BuildRequires when building its documentation Modified: branches/SuSE-Code-11-Branch/doc/_build-www.sh Modified: branches/SuSE-Code-11-Branch/doc/_build-www.sh URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/doc/_buil… ============================================================================== --- branches/SuSE-Code-11-Branch/doc/_build-www.sh (original) +++ branches/SuSE-Code-11-Branch/doc/_build-www.sh Thu Feb 26 15:59:29 2009 @@ -51,7 +51,7 @@ TEST_X=$? echo "Checking for errors..." if [ $TEST_X != 0 ]; then - echo "There were some errors... exiting..." + echo "There were some errors... exiting... current dir: "`pwd` exit 42; fi } @@ -70,15 +70,11 @@ echo echo "*** Checking for installed packages... ***" NEEDED_PACKAGES="docbook2x - docbook-css-stylesheets docbook-dsssl-stylesheets docbook-xml-website docbook-xsl-stylesheets - docbook-simple - docbook-tdg docbook-toys docbook-utils - docbook-xml-slides docbook_3 docbook_4 perl @@ -87,8 +83,8 @@ make gettext-tools gettext-runtime - perl-XML-Generator - fop" + fop + yast2-devtools" echo "Calling zypper install" rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) @@ -123,8 +119,14 @@ echo "*** CREATING ... in source/core" echo "*** CREATING ... in source/core" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} + cd core echo "| Current directory: "`pwd` + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors make clean >> ${BUILDLOG} 2>>${BUILDLOG} @@ -135,6 +137,11 @@ echo "*** CREATING XML SOURCES IN source/libyui/doc ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd libyui + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} make ${MAKE_PARAMS} >> ${BUILDLOG} 2>>${BUILDLOG} || (echo "2 exiting..." && exit 42) @@ -146,6 +153,11 @@ echo "*** CREATING XML SOURCES IN ycp-ui-bindings ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd ycp-ui-bindings + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` # because 'doc' is missing there cp --force SUBDIRS SUBDIRS.doc-build-backup @@ -162,6 +174,11 @@ echo "*** CREATING XML SOURCES IN source/yast2 ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd yast2 + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors @@ -176,6 +193,11 @@ echo "*** CREATING XML SOURCES IN source/installation ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd installation + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors @@ -204,8 +226,14 @@ # Creating pkg-bindings cd ${SRCDIR} +cd pkg-bindings + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} -cd pkg-bindings/doc +cd doc echo "| Current directory: "`pwd` rm -rf html >> ${BUILDLOG} 2>>${BUILDLOG} make >> ${BUILDLOG} 2>>${BUILDLOG} -- 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] r55794 - /trunk/doc/_build-www.sh
by locilka＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: locilka Date: Thu Feb 26 15:59:21 2009 New Revision: 55794 URL: http://svn.opensuse.org/viewcvs/yast?rev=55794&view=rev Log: Using package BuildRequires when building its documentation Modified: trunk/doc/_build-www.sh Modified: trunk/doc/_build-www.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/_build-www.sh?rev=55794&r1=5… ============================================================================== --- trunk/doc/_build-www.sh (original) +++ trunk/doc/_build-www.sh Thu Feb 26 15:59:21 2009 @@ -51,7 +51,7 @@ TEST_X=$? echo "Checking for errors..." if [ $TEST_X != 0 ]; then - echo "There were some errors... exiting..." + echo "There were some errors... exiting... current dir: "`pwd` exit 42; fi } @@ -70,15 +70,11 @@ echo echo "*** Checking for installed packages... ***" NEEDED_PACKAGES="docbook2x - docbook-css-stylesheets docbook-dsssl-stylesheets docbook-xml-website docbook-xsl-stylesheets - docbook-simple - docbook-tdg docbook-toys docbook-utils - docbook-xml-slides docbook_3 docbook_4 perl @@ -87,8 +83,8 @@ make gettext-tools gettext-runtime - perl-XML-Generator - fop" + fop + yast2-devtools" echo "Calling zypper install" rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) @@ -123,8 +119,14 @@ echo "*** CREATING ... in source/core" echo "*** CREATING ... in source/core" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} + cd core echo "| Current directory: "`pwd` + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors make clean >> ${BUILDLOG} 2>>${BUILDLOG} @@ -135,6 +137,11 @@ echo "*** CREATING XML SOURCES IN source/libyui/doc ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd libyui + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} make ${MAKE_PARAMS} >> ${BUILDLOG} 2>>${BUILDLOG} || (echo "2 exiting..." && exit 42) @@ -146,6 +153,11 @@ echo "*** CREATING XML SOURCES IN ycp-ui-bindings ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd ycp-ui-bindings + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` # because 'doc' is missing there cp --force SUBDIRS SUBDIRS.doc-build-backup @@ -162,6 +174,11 @@ echo "*** CREATING XML SOURCES IN source/yast2 ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd yast2 + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors @@ -176,6 +193,11 @@ echo "*** CREATING XML SOURCES IN source/installation ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd installation + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors @@ -204,8 +226,14 @@ # Creating pkg-bindings cd ${SRCDIR} +cd pkg-bindings + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} -cd pkg-bindings/doc +cd doc echo "| Current directory: "`pwd` rm -rf html >> ${BUILDLOG} 2>>${BUILDLOG} make >> ${BUILDLOG} 2>>${BUILDLOG} -- 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] r55793 - /tags/stable-2_18_7/printer/
by jsmeix＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: jsmeix Date: Thu Feb 26 15:27:59 2009 New Revision: 55793 URL: http://svn.opensuse.org/viewcvs/yast?rev=55793&view=rev Log: Created tag stable-2_18_7 for printer Added: tags/stable-2_18_7/printer/ - copied from r55792, trunk/printer/ -- 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] r55792 - in /trunk/printer: VERSION package/yast2-printer.changes src/basicadd.ycp src/basicmodify.ycp src/helps.ycp
by jsmeix＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: jsmeix Date: Thu Feb 26 15:27:52 2009 New Revision: 55792 URL: http://svn.opensuse.org/viewcvs/yast?rev=55792&view=rev Log: - Fixed the "More Drivers" functionality in basicmodify.ycp to show the current driver topmost in any case. - Enhanced help texts for basicadd.ycp and basicmodify.ycp to describe driver related issues in much more detail. - Call Wizard::SetContents with empty content in basicadd.ycp and basicmodify.ycp to avoid that initially the previous dialog is shown until the real content is generated. - 2.18.7 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/basicadd.ycp trunk/printer/src/basicmodify.ycp trunk/printer/src/helps.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=55792&r1=557… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Thu Feb 26 15:27:52 2009 @@ -1 +1 @@ -2.18.6 +2.18.7 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Thu Feb 26 15:27:52 2009 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Thu Feb 26 14:49:04 CET 2009 - jsmeix(a)suse.de + +- Fixed the "More Drivers" functionality in basicmodify.ycp + to show the current driver topmost in any case. +- Enhanced help texts for basicadd.ycp and basicmodify.ycp + to describe driver related issues in much more detail. +- Call Wizard::SetContents with empty content in basicadd.ycp + and basicmodify.ycp to avoid that initially the previous + dialog is shown until the real content is generated. +- 2.18.7 + +------------------------------------------------------------------- Wed Feb 25 16:19:45 CET 2009 - jsmeix(a)suse.de - Added a "More Drivers" functionality to basicadd.ycp and Modified: trunk/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicadd.ycp?rev=557… ============================================================================== --- trunk/printer/src/basicadd.ycp (original) +++ trunk/printer/src/basicadd.ycp Thu Feb 26 15:27:52 2009 @@ -47,6 +47,16 @@ { y2milestone( "entering BasicAddDialog" ); // Caption for the "Add Printer" dialog (BasicAddDialog): string caption = _("Add New Printer Configuration"); + // Clear whatever content of a previous dialog which would show up here for several seconds + // until all the following stuff is done before Wizard::SetContentsButtons is called + // which finally shows the right content for this dialog. + Wizard::SetContents( caption, + `Empty(), + HELPS["basic_add_dialog"]:"", + false, + false + ); + Wizard::HideAbortButton(); string driver_filter_string = "BasicAddDialog"; string driver_filter_input_text = ""; string queue_name_proposal = ""; Modified: trunk/printer/src/basicmodify.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicmodify.ycp?rev=… ============================================================================== --- trunk/printer/src/basicmodify.ycp (original) +++ trunk/printer/src/basicmodify.ycp Thu Feb 26 15:27:52 2009 @@ -66,6 +66,16 @@ // Title of the Basic Modify Dialog where %1 will be replaced by the queue name. // The actual queue name is a system value which cannot be translated: string caption = sformat( _("Modify %1") , name ); + // Clear whatever content of a previous dialog which would show up here for several seconds + // until all the following stuff is done before Wizard::SetContentsButtons is called + // which finally shows the right content for this dialog. + Wizard::SetContents( caption, + `Empty(), + HELPS["basic_modify_dialog"]:"", + false, + false + ); + Wizard::HideAbortButton(); string model = ""; list <string> description_words = splitstring( description, " " ); if( size( description_words ) > 2 ) @@ -296,7 +306,7 @@ ( `Left ( `Label ( // Caption for a printer driver selection: - _("Driver") + _("Adjust Options of the Current Driver or Assign a Different Driver") ) ), `ReplacePoint @@ -971,16 +981,17 @@ driver_items = Printer::DriverItems( "", true ); } UI::ReplaceWidget( `id(`driver_selection_replace_point), - `SelectionBox - ( `id(`driver_selection), - // By default there is no UserInput() - // if only something was selected in the SelectionBox - // (without clicking additionally a button) - // but the notify option forces UserInput() in this case: - `opt(`notify), - "", - driver_items - ) + `SelectionBox( `id(`driver_selection), + // By default there is no UserInput() + // if only something was selected in the SelectionBox + // (without clicking additionally a button) + // but the notify option forces UserInput() in this case: + `opt(`notify), + "", + prepend( driver_items, + current_driver + ) + ) ); continue; } Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=55792&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Thu Feb 26 15:27:52 2009 @@ -147,7 +147,48 @@ The driver determines that the right data is produced for the specific printer model. If a wrong driver is assigned, wrong data is sent to the printer -which results bad looking printout, chaotic printout, or no printout at all. +which results bad looking printout, chaotic printout, or no printout at all. +Initially the input field for the driver search string is preset +with the autodetected model name of the currently selected connection +and those drivers where the driver description matches to the model name +are shown by default. +If driver descriptions match to the autodetected model name +and if all matching driver descriptions seem to belong to the same model, +the driver descriptions are sorted so that the most reasonable driver +should be listed topmost and this one is automatically preselected. +If no driver is automatically preselected, you must manually +find and select an appropriate driver. +On the other hand if a driver was automatically preselected, +it does not necessarily mean that this driver is +a reasonable driver for your particular needs. +Strictly speaking an automatically preselected driver +may not work at all for your particular printer model. +The reason is that the automated driver selection +can only work based upon comparison of strings +(the autodetected model name and the driver descriptions) +so that the result can be only a best-guess proposal +how to set up your particular printer model. +Therefore check if the currently preselected values make sense +and feel free to play around and modify the settings +to what you know what works best for your printer. +If no driver description matches to the autodetected model name, +it does not necessarily mean that there is no driver available for the model. +Often only the model name in the driver descriptions +is different from the autodetected model name. +Therefore you can enter whatever you like as driver search string +and search through all available driver descriptions. +Usually the default driver option settings should be reasonable +so that the driver works for your particular printer model. +Some driver option settings must match to your particular printer. +In particular the default paper size setting of the driver +must match to the paper which is actually loaded in your printer. +You can either explicitely select A4 or Letter as default paper size +or select nothing to use the built-in default paper size of the driver +which is also the fallback if the driver neither supports A4 nor Letter +(for example a driver for a small-format photo printer). +If you like to adjust other driver options except A4 or Letter, +you must first set up the queue and then in a second step +you can adjust all driver options in the 'Edit/Modify' dialog. ") + // BasicAddDialog help 5/5: _(" @@ -175,7 +216,34 @@ The latter is provided by the HP driver package 'hplip'. For plain printing both kind of connections should work but for anything else (e.g. device status via 'hp-toolbox', or scanning with a HP all-in-one device) -the 'hp:/...' connection must be used. +the 'hp:/...' connection must be used. +When you exchange the currently used connection by another one, +the input field for the driver search string is preset +with the autodetected model name of the new selected connection +and those drivers where the driver description matches to the model name +are shown by default. +If driver descriptions match to the autodetected model name +and if all matching driver descriptions seem to belong to the same model, +the driver descriptions are sorted so that the most reasonable driver +should be listed topmost (but still below the currently used driver). +On the other hand, it does not necessarily mean that this driver is +a reasonable driver for your particular needs. +Strictly speaking the topmost listed driver +may not work at all for your particular printer model. +The reason is that the automated driver selection +can only work based upon comparison of strings +(the autodetected model name and the driver descriptions) +so that the result can be only a best-guess proposal +how to set up your particular printer model. +Therefore check if the currently preselected values make sense +and feel free to play around and modify the settings +to what you know what works best for your printer. +If no driver description matches to the autodetected model name, +it does not necessarily mean that there is no driver available for the model. +Often only the model name in the driver descriptions +is different from the autodetected model name. +Therefore you can enter whatever you like as driver search string +and search through all available driver descriptions. ") + // BasicModifyDialog help 3/4: _(" @@ -193,7 +261,21 @@ should work for the particular driver. Nevertheless it may happen that your particular printer fails to print with high resolution. For example when you have a laser printer -which has insufficient built-in memory to process high resolution pages. +which has insufficient built-in memory to process high resolution pages. +When you exchange the currently used driver by another one, +you must first apply this change to the print queue +so that the new driver is used for the queue +(i.e. you must finish this dialog as a first step) +and then in a second step you can adjust all driver options +by using this dialog again. +Initially the input field for the driver search string is preset +with the description of the currently used driver when the connection was not changed. +This results usually only one single driver which matches +so that you would have to enter a less specific driver search string +to get also other drivers or you use the 'More Drivers' button. +If no driver matches, it does not mean that there is no driver available. +Therefore you can enter whatever you like as driver search string +and search through all available driver descriptions. ") + // BasicModifyDialog help 4/4: _(" @@ -299,9 +381,9 @@ (separated by slash '/' characters) which specify the details for this kind of data-transfer. Finally there could be optional parameters (separated by a question mark '?') -of the form option1=value1&option2=value2&option3=value3 so that +of the form option1=value1&option2=value2&option3=value3 so that a full device URI could be for example: -ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false +ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false Special characters must be percent-encoded (also known as URL encoding). For example a space character ' ' must be written as '%20' and a plus sign '+' must be written as '%2B'. -- 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] r55791 - in /trunk/storage/libstorage/src: SystemCmd.cc SystemCmd.h
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 14:48:12 2009 New Revision: 55791 URL: http://svn.opensuse.org/viewcvs/yast?rev=55791&view=rev Log: - some SystemCmd cleanup: - removed unused code - use const string& as parameter - other minor issues Modified: trunk/storage/libstorage/src/SystemCmd.cc trunk/storage/libstorage/src/SystemCmd.h Modified: trunk/storage/libstorage/src/SystemCmd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd… ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.cc (original) +++ trunk/storage/libstorage/src/SystemCmd.cc Thu Feb 26 14:48:12 2009 @@ -22,14 +22,6 @@ using namespace storage; -SystemCmd::SystemCmd( const char* Command ) -{ - y2mil("constructor SystemCmd:\"" << Command << "\""); - init(); - execute( Command ); -} - - SystemCmd::SystemCmd( const string& Command_Cv ) { y2mil("constructor SystemCmd:\"" << Command_Cv << "\""); @@ -48,8 +40,6 @@ void SystemCmd::init() { Combine_b = false; - OutputHandler_f = NULL; - HandlerPar_p = NULL; output_proc = NULL; File_aC[0] = File_aC[1] = NULL; pfds[0].events = pfds[1].events = POLLIN; @@ -66,14 +56,6 @@ void -SystemCmd::setOutputHandler( void (*Handle_f)( void *, string, bool ), void * Par_p ) - { - OutputHandler_f = Handle_f; - HandlerPar_p = Par_p; - } - - -void SystemCmd::closeOpenFds() { int max_fd = getdtablesize(); @@ -85,7 +67,7 @@ int -SystemCmd::execute( const string& Cmd_Cv ) +SystemCmd::execute(const string& Cmd_Cv) { y2mil("SystemCmd Executing:\"" << Cmd_Cv << "\""); Background_b = false; @@ -169,7 +151,7 @@ #define ALTERNATE_SHELL "/bin/bash" int -SystemCmd::doExecute( string Cmd ) +SystemCmd::doExecute( const string& Cmd ) { string Shell_Ci = PRIMARY_SHELL; if( access( Shell_Ci.c_str(), X_OK ) != 0 ) @@ -305,13 +287,13 @@ { int Wait_ii; int Status_ii; - int sel; do { y2deb("[0] id:" << pfds[0].fd << " ev:" << hex << (unsigned)pfds[0].events << dec << " [1] fs:" << (Combine_b?-1:pfds[1].fd) << " ev:" << hex << (Combine_b?0:(unsigned)pfds[1].events)); - if( (sel=poll( pfds, Combine_b?1:2, 1000 ))<0 ) + int sel = poll( pfds, Combine_b?1:2, 1000 ); + if (sel < 0) { y2err("poll failed errno:" << errno << " (" << strerror(errno) << ")"); } @@ -324,6 +306,7 @@ y2deb("Wait ret:" << Wait_ii); } while( Hang_bv && Wait_ii == 0 ); + if( Wait_ii != 0 ) { checkOutput(); @@ -429,30 +412,24 @@ int -SystemCmd::select( string Pat_Cv, bool Invert_bv, OutputStream Idx_iv ) +SystemCmd::select( const string& Pat_Cv, bool Invert_bv, OutputStream Idx_iv ) { - int I_ii; - int End_ii; - int Size_ii; - string::size_type Pos_ii; - bool BeginOfLine_bi; - string Search_Ci( Pat_Cv ); - if( Idx_iv > 1 ) { y2err("invalid index " << Idx_iv); } - BeginOfLine_bi = Search_Ci.length()>0 && Search_Ci[0]=='^'; + string Search_Ci( Pat_Cv ); + bool BeginOfLine_bi = Search_Ci.length()>0 && Search_Ci[0]=='^'; if( BeginOfLine_bi ) { Search_Ci.erase( 0, 1 ); } SelLines_aC[Idx_iv].resize(0); - Size_ii = 0; - End_ii = Lines_aC[Idx_iv].size(); - for( I_ii=0; I_ii<End_ii; I_ii++ ) + int Size_ii = 0; + int End_ii = Lines_aC[Idx_iv].size(); + for( int I_ii=0; I_ii<End_ii; I_ii++ ) { - Pos_ii = Lines_aC[Idx_iv][I_ii].find( Search_Ci ); + string::size_type Pos_ii = Lines_aC[Idx_iv][I_ii].find( Search_Ci ); if( Pos_ii>0 && BeginOfLine_bi ) { Pos_ii = string::npos; @@ -523,11 +500,6 @@ { output_proc->process( Buf_ti, Stderr_bv ); } - if( OutputHandler_f ) - { - y2deb("Calling Output-Handler Buf:\"" << Buf_ti << "\" Stderr:" << Stderr_bv); - OutputHandler_f( HandlerPar_p, Buf_ti, Stderr_bv ); - } } Char_ii = EOF; } @@ -539,11 +511,6 @@ { output_proc->process( Buf_ti, Stderr_bv ); } - if( OutputHandler_f ) - { - y2deb("Calling Output-Handler Buf:\"" << Buf_ti << "\" Stderr:" << Stderr_bv); - OutputHandler_f( HandlerPar_p, Buf_ti, Stderr_bv ); - } } if( Text_Ci.length() > 0 ) { @@ -570,8 +537,8 @@ void -SystemCmd::extractNewline( const char* Buf_ti, int Cnt_iv, bool& NewLine_br, - string& Text_Cr, vector<string>& Lines_Cr ) +SystemCmd::extractNewline(const string& Buf_ti, int Cnt_iv, bool& NewLine_br, + string& Text_Cr, vector<string>& Lines_Cr) { string::size_type Idx_ii; @@ -594,7 +561,7 @@ void -SystemCmd::addLine(string Text_Cv, vector<string>& Lines_Cr) +SystemCmd::addLine(const string& Text_Cv, vector<string>& Lines_Cr) { if (Lines_Cr.size() < 100) { @@ -619,13 +586,15 @@ } -string SystemCmd::quote(const string& str) +string +SystemCmd::quote(const string& str) { return "'" + boost::replace_all_copy(str, "'", "'\\''") + "'"; } -string SystemCmd::quote(const list<string>& strs) +string +SystemCmd::quote(const list<string>& strs) { string ret; for (std::list<string>::const_iterator it = strs.begin(); it != strs.end(); it++) Modified: trunk/storage/libstorage/src/SystemCmd.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd… ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.h (original) +++ trunk/storage/libstorage/src/SystemCmd.h Thu Feb 26 14:48:12 2009 @@ -21,20 +21,19 @@ enum OutputStream { IDX_STDOUT, IDX_STDERR }; - SystemCmd( const char* Command_Cv ); - SystemCmd( const string& Command_Cv ); + SystemCmd(const string& Command_Cv); SystemCmd(); virtual ~SystemCmd(); - int execute( const string& Command_Cv ); - int executeBackground( const string& Command_Cv ); - int executeRestricted( const string& Command_Cv, - unsigned long MaxTimeSec, unsigned long MaxLineOut, - bool& ExceedTime, bool& ExceedLines); + int execute(const string& Command_Cv); + int executeBackground(const string& Command_Cv); + int executeRestricted(const string& Command_Cv, + unsigned long MaxTimeSec, unsigned long MaxLineOut, + bool& ExceedTime, bool& ExceedLines); + + void setOutputProcessor(OutputProcessor* proc) { output_proc = proc; } - void setOutputHandler( void (*Handle_f)( void *, string, bool ), void * Par_p ); - void setOutputProcessor( OutputProcessor * proc ) { output_proc = proc; } void logOutput() const; string stderr() const { return getString(IDX_STDERR); } @@ -42,7 +41,7 @@ string cmd() const { return lastCmd; } int retcode() const { return Ret_i; } - int select(string Reg_Cv, bool Invert_bv = false, OutputStream Idx_ii = IDX_STDOUT); + int select(const string& Reg_Cv, bool Invert_bv = false, OutputStream Idx_ii = IDX_STDOUT); unsigned numLines(bool Selected_bv = false, OutputStream Idx_ii = IDX_STDOUT) const; string getLine(unsigned Num_iv, bool Selected_bv = false, OutputStream Idx_ii = IDX_STDOUT) const; @@ -64,14 +63,14 @@ void invalidate(); void closeOpenFds(); - int doExecute( string Cmd_Cv ); - bool doWait( bool Hang_bv, int& Ret_ir ); + int doExecute(const string& Cmd_Cv); + bool doWait(bool Hang_bv, int& Ret_ir); void checkOutput(); - void getUntilEOF( FILE* File_Cr, std::vector<string>& Lines_Cr, - bool& NewLineSeen_br, bool Stderr_bv ); - void extractNewline( const char* Buf_ti, int Cnt_ii, bool& NewLineSeen_br, - string& Text_Cr, std::vector<string>& Lines_Cr ); - void addLine( string Text_Cv, std::vector<string>& Lines_Cr ); + void getUntilEOF(FILE* File_Cr, std::vector<string>& Lines_Cr, + bool& NewLineSeen_br, bool Stderr_bv); + void extractNewline(const string& Buf_ti, int Cnt_ii, bool& NewLineSeen_br, + string& Text_Cr, std::vector<string>& Lines_Cr); + void addLine(const string& Text_Cv, std::vector<string>& Lines_Cr); void init(); string getString(OutputStream Idx_ii = IDX_STDOUT) const; @@ -85,8 +84,6 @@ string lastCmd; int Ret_i; int Pid_i; - void (* OutputHandler_f)( void*, string, bool ); - void *HandlerPar_p; OutputProcessor* output_proc; struct pollfd pfds[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] r55790 - in /trunk/sound: data/addons/mixer.ycp data/sndcards.ycp package/yast2-sound.changes sound/src/Sound.ycp sound/src/volume.ycp
by lslezak＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: lslezak Date: Thu Feb 26 14:20:05 2009 New Revision: 55790 URL: http://svn.opensuse.org/viewcvs/yast?rev=55790&view=rev Log: - set 100% volume for snd-hda-intel driver (bnc#477853), (bnc#466428) Modified: trunk/sound/data/addons/mixer.ycp trunk/sound/data/sndcards.ycp trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/Sound.ycp trunk/sound/sound/src/volume.ycp Modified: trunk/sound/data/addons/mixer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/data/addons/mixer.ycp?rev=… ============================================================================== --- trunk/sound/data/addons/mixer.ycp (original) +++ trunk/sound/data/addons/mixer.ycp Thu Feb 26 14:20:05 2009 @@ -34,6 +34,16 @@ "Wave": 100, "Music": 100 ] - ] - + ], + "snd-hda-intel": + $[ + "mixer": + $[ + "Front": 100, + "Surround": 100, + "Center": 100, + "LFE": 100, + "PCM": 100, + ] + ], ] Modified: trunk/sound/data/sndcards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/data/sndcards.ycp?rev=5579… ============================================================================== --- trunk/sound/data/sndcards.ycp (original) +++ trunk/sound/data/sndcards.ycp Thu Feb 26 14:20:05 2009 @@ -2390,6 +2390,13 @@ ], "snd-hda-intel" : $[ "description" : "Intel HDA driver", + "mixer" : $[ + "Center" : 100, + "Front" : 100, + "LFE" : 100, + "Surround" : 100, + "PCM" : 100 + ], "params" : $[ "model" : $[ "descr" : _("Use the given board model.") Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Thu Feb 26 14:20:05 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 26 12:49:21 CET 2009 - lslezak(a)suse.cz + +- set 100% volume for snd-hda-intel driver (bnc#477853), + (bnc#466428) + +------------------------------------------------------------------- Wed Jan 28 10:04:59 CET 2009 - lslezak(a)suse.cz - do not restore volume settings at start up (bnc#466456) Modified: trunk/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/Sound.ycp?rev=55… ============================================================================== --- trunk/sound/sound/src/Sound.ycp (original) +++ trunk/sound/sound/src/Sound.ycp Thu Feb 26 14:20:05 2009 @@ -1363,7 +1363,12 @@ */ global define void InitMixer(integer c_id, string modname) ``{ y2milestone("InitMixer: %1, %2", c_id, modname); - map devs = db_modules[modname, "mixer"]:$["Master":70, "PCM":70, "CD":70, "Synth":70, "Front":70, "Headphone":70, "Master Mono":70, "iSpeaker":70 ]; + + map devs = db_modules[modname, "mixer"]: + $["Master":default_volume, "PCM":default_volume, "CD":default_volume, + "Synth":default_volume, "Front":default_volume, "Headphone":default_volume, + "Master Mono":default_volume, "iSpeaker":default_volume ]; + y2milestone("Mixer devices: %1", devs); // now let's merge settings from volume_settings list @@ -1373,7 +1378,12 @@ foreach (list channel, volume_settings[c_id]:[], ``{ y2debug("devs: %1", devs); y2debug("channel: %1", channel); - devs = add (devs, channel[0]:"Master", channel[1]:70); + + // do not rewrite the values from DB + if (!haskey(devs, channel[0]:"Master")) + { + devs = add (devs, channel[0]:"Master", channel[1]:default_volume); + } }); } y2milestone("Mixer devices after merge: %1", devs); Modified: trunk/sound/sound/src/volume.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/volume.ycp?rev=5… ============================================================================== --- trunk/sound/sound/src/volume.ycp (original) +++ trunk/sound/sound/src/volume.ycp Thu Feb 26 14:20:05 2009 @@ -370,25 +370,27 @@ string master_elem = Sound::db_modules[modname, "main_volume"]:"Master"; setVolume (master_elem, card_id, Sound::default_volume); - setVolume ("Headphone", card_id, Sound::default_volume); - setVolume ("Front", card_id, Sound::default_volume); map devs = Sound::db_modules[modname, "mixer"]:$[]; + + setVolume ("Headphone", card_id, devs["Headphone"]:Sound::default_volume); + setVolume ("Front", card_id, devs["Front"]:Sound::default_volume); + if (haskey (devs, "PCM")) { - setVolume ("PCM", card_id, Sound::default_volume); + setVolume ("PCM", card_id, devs["PCM"]:Sound::default_volume); } if (haskey (devs, "Master Mono")) { - setVolume ("Master Mono", card_id, Sound::default_volume); + setVolume ("Master Mono", card_id, devs["Master Mono"]:Sound::default_volume); } if (haskey (devs, "iSpeaker")) { - setVolume ("iSpeaker", card_id, Sound::default_volume); + setVolume ("iSpeaker", card_id, devs["iSpeaker"]:Sound::default_volume); } if (haskey (devs, "Speaker")) { - setVolume ("Speaker", card_id, Sound::default_volume); + setVolume ("Speaker", card_id, devs["Speaker"]:Sound::default_volume); } -- 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] r55789 - /tags/branch-Code-11-2_17_15/sound/
by lslezak＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: lslezak Date: Thu Feb 26 14:09:53 2009 New Revision: 55789 URL: http://svn.opensuse.org/viewcvs/yast?rev=55789&view=rev Log: Created tag branch-Code-11-2_17_15 for sound Added: tags/branch-Code-11-2_17_15/sound/ - copied from r55788, branches/SuSE-Code-11-Branch/sound/ -- 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] r55788 - in /branches/SuSE-Code-11-Branch/sound: VERSION data/addons/mixer.ycp data/sndcards.ycp package/yast2-sound.changes sound/src/Sound.ycp sound/src/volume.ycp
by lslezak＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: lslezak Date: Thu Feb 26 14:09:44 2009 New Revision: 55788 URL: http://svn.opensuse.org/viewcvs/yast?rev=55788&view=rev Log: - set 100% volume for snd-hda-intel driver (bnc#477853), (bnc#466428) - 2.17.15 Modified: branches/SuSE-Code-11-Branch/sound/VERSION branches/SuSE-Code-11-Branch/sound/data/addons/mixer.ycp branches/SuSE-Code-11-Branch/sound/data/sndcards.ycp branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes branches/SuSE-Code-11-Branch/sound/sound/src/Sound.ycp branches/SuSE-Code-11-Branch/sound/sound/src/volume.ycp Modified: branches/SuSE-Code-11-Branch/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/VERSION (original) +++ branches/SuSE-Code-11-Branch/sound/VERSION Thu Feb 26 14:09:44 2009 @@ -1 +1 @@ -2.17.14 +2.17.15 Modified: branches/SuSE-Code-11-Branch/sound/data/addons/mixer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/dat… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/data/addons/mixer.ycp (original) +++ branches/SuSE-Code-11-Branch/sound/data/addons/mixer.ycp Thu Feb 26 14:09:44 2009 @@ -34,6 +34,16 @@ "Wave": 100, "Music": 100 ] - ] - + ], + "snd-hda-intel": + $[ + "mixer": + $[ + "Front": 100, + "Surround": 100, + "Center": 100, + "LFE": 100, + "PCM": 100, + ] + ], ] Modified: branches/SuSE-Code-11-Branch/sound/data/sndcards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/dat… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/data/sndcards.ycp (original) +++ branches/SuSE-Code-11-Branch/sound/data/sndcards.ycp Thu Feb 26 14:09:44 2009 @@ -2390,6 +2390,13 @@ ], "snd-hda-intel" : $[ "description" : "Intel HDA driver", + "mixer" : $[ + "Center" : 100, + "Front" : 100, + "LFE" : 100, + "Surround" : 100, + "PCM" : 100 + ], "params" : $[ "model" : $[ "descr" : _("Use the given board model.") Modified: branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes Thu Feb 26 14:09:44 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 26 12:49:21 CET 2009 - lslezak(a)suse.cz + +- set 100% volume for snd-hda-intel driver (bnc#477853), + (bnc#466428) +- 2.17.15 + +------------------------------------------------------------------- Fri Jan 9 15:55:15 CET 2009 - lslezak(a)suse.cz - fixed snd slots option for snd-aoa driver (PPC) (bnc#460338) Modified: branches/SuSE-Code-11-Branch/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/sou… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/sound/src/Sound.ycp (original) +++ branches/SuSE-Code-11-Branch/sound/sound/src/Sound.ycp Thu Feb 26 14:09:44 2009 @@ -1411,7 +1411,12 @@ */ global define void InitMixer(integer c_id, string modname) ``{ y2milestone("InitMixer: %1, %2", c_id, modname); - map devs = db_modules[modname, "mixer"]:$["Master":70, "PCM":70, "CD":70, "Synth":70, "Front":70, "Headphone":70, "Master Mono":70, "iSpeaker":70 ]; + + map devs = db_modules[modname, "mixer"]: + $["Master":default_volume, "PCM":default_volume, "CD":default_volume, + "Synth":default_volume, "Front":default_volume, "Headphone":default_volume, + "Master Mono":default_volume, "iSpeaker":default_volume ]; + y2milestone("Mixer devices: %1", devs); // now let's merge settings from volume_settings list @@ -1421,7 +1426,12 @@ foreach (list channel, volume_settings[c_id]:[], ``{ y2debug("devs: %1", devs); y2debug("channel: %1", channel); - devs = add (devs, channel[0]:"Master", channel[1]:70); + + // do not rewrite the values from DB + if (!haskey(devs, channel[0]:"Master")) + { + devs = add (devs, channel[0]:"Master", channel[1]:default_volume); + } }); } y2milestone("Mixer devices after merge: %1", devs); Modified: branches/SuSE-Code-11-Branch/sound/sound/src/volume.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/sou… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/sound/src/volume.ycp (original) +++ branches/SuSE-Code-11-Branch/sound/sound/src/volume.ycp Thu Feb 26 14:09:44 2009 @@ -370,25 +370,27 @@ string master_elem = Sound::db_modules[modname, "main_volume"]:"Master"; setVolume (master_elem, card_id, Sound::default_volume); - setVolume ("Headphone", card_id, Sound::default_volume); - setVolume ("Front", card_id, Sound::default_volume); map devs = Sound::db_modules[modname, "mixer"]:$[]; + + setVolume ("Headphone", card_id, devs["Headphone"]:Sound::default_volume); + setVolume ("Front", card_id, devs["Front"]:Sound::default_volume); + if (haskey (devs, "PCM")) { - setVolume ("PCM", card_id, Sound::default_volume); + setVolume ("PCM", card_id, devs["PCM"]:Sound::default_volume); } if (haskey (devs, "Master Mono")) { - setVolume ("Master Mono", card_id, Sound::default_volume); + setVolume ("Master Mono", card_id, devs["Master Mono"]:Sound::default_volume); } if (haskey (devs, "iSpeaker")) { - setVolume ("iSpeaker", card_id, Sound::default_volume); + setVolume ("iSpeaker", card_id, devs["iSpeaker"]:Sound::default_volume); } if (haskey (devs, "Speaker")) { - setVolume ("Speaker", card_id, Sound::default_volume); + setVolume ("Speaker", card_id, devs["Speaker"]:Sound::default_volume); } -- 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] r55787 - in /trunk/storage/libstorage/src: AppUtil.cc Dasd.cc Disk.cc Dm.cc DmCo.cc DmmultipathCo.cc DmraidCo.cc LvmLv.cc LvmVg.cc Md.cc ProcMounts.cc Storage.cc SystemCmd.cc SystemCmd.h Volume.cc
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 12:27:26 2009 New Revision: 55787 URL: http://svn.opensuse.org/viewcvs/yast?rev=55787&view=rev Log: - some SystemCmd cleanup: - use enum instead of int in interface - make function return string instead of pointer/reference to string - other minor issues Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Dm.cc trunk/storage/libstorage/src/DmCo.cc trunk/storage/libstorage/src/DmmultipathCo.cc trunk/storage/libstorage/src/DmraidCo.cc trunk/storage/libstorage/src/LvmLv.cc trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/Md.cc trunk/storage/libstorage/src/ProcMounts.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/SystemCmd.cc trunk/storage/libstorage/src/SystemCmd.h trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.c… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Thu Feb 26 12:27:26 2009 @@ -508,7 +508,7 @@ SystemCmd c( cmd ); if( c.numLines()>0 ) { - extractNthWord( 0, *c.getLine(0)) >> ret; + extractNthWord( 0, c.getLine(0)) >> ret; } y2mil( "driver:" << driver << " ret:" << ret ); return( ret ); Modified: trunk/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Dasd.cc (original) +++ trunk/storage/libstorage/src/Dasd.cc Thu Feb 26 12:27:26 2009 @@ -61,7 +61,7 @@ { if( Cmd.select( "^format" )>0 ) { - string tmp = *Cmd.getLine(0, true); + string tmp = Cmd.getLine(0, true); y2milestone( "Format line:%s", tmp.c_str() ); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = boost::to_lower_copy(extractNthWord(4, tmp), locale::classic()); @@ -171,7 +171,7 @@ unsigned long c_start; unsigned long c_size; - line = *cmd.getLine(i); + line = cmd.getLine(i); tmp = extractNthWord( 0, line ); if( part.match(tmp) ) { @@ -234,7 +234,7 @@ if( cmd.select( "cylinders" )>0 ) { val = 0; - tmp = *cmd.getLine(0, true); + tmp = cmd.getLine(0, true); y2milestone( "Cylinder line:%s", tmp.c_str() ); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); @@ -245,7 +245,7 @@ if( cmd.select( "tracks per" )>0 ) { val = 0; - tmp = *cmd.getLine(0, true); + tmp = cmd.getLine(0, true); y2milestone( "Tracks line:%s", tmp.c_str() ); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); @@ -256,7 +256,7 @@ if( cmd.select( "blocks per" )>0 ) { val = 0; - tmp = *cmd.getLine(0, true); + tmp = cmd.getLine(0, true); y2milestone( "Blocks line:%s", tmp.c_str() ); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); @@ -267,7 +267,7 @@ if( cmd.select( "blocksize" )>0 ) { val = 0; - tmp = *cmd.getLine(0, true); + tmp = cmd.getLine(0, true); y2milestone( "Bytes line:%s", tmp.c_str() ); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Thu Feb 26 12:27:26 2009 @@ -381,13 +381,13 @@ checkSystemError( cmd_line, Cmd ); if( Cmd.select( "Partition Table:" )>0 ) { - string tmp = *Cmd.getLine(0, true); + string tmp = Cmd.getLine(0, true); y2mil("Label line:" << tmp); dlabel = extractNthWord( 2, tmp ); } if( Cmd.select( "BIOS cylinder" )>0 ) { - string tmp = *Cmd.getLine(0, true); + string tmp = Cmd.getLine(0, true); getGeometry( tmp, cyl, head, sector ); new_cyl = cyl; new_head = head; @@ -791,7 +791,7 @@ unsigned id; bool boot; - line = *Cmd.getLine(i); + line = Cmd.getLine(i); tmp = extractNthWord( 0, line ); if( tmp.length()>0 && isdigit(tmp[0]) ) { @@ -1946,7 +1946,7 @@ unsigned long c; unsigned h; unsigned s; - string tmp = *Cmd.getLine(0, true); + string tmp = Cmd.getLine(0, true); getGeometry( tmp, c, h, s ); if( c!=0 && c!=cyl ) { @@ -2065,8 +2065,7 @@ PartitionType type; bool boot; if( cmd.numLines()>0 && - scanPartedLine( *cmd.getLine(0), nr, start, csize, type, - id, boot )) + scanPartedLine( cmd.getLine(0), nr, start, csize, type, id, boot )) { y2milestone( "really created at cyl:%ld csize:%ld", start, csize ); p->changeRegion( start, csize, cylinderToKb(csize) ); @@ -2110,7 +2109,7 @@ if( cmd.numLines()>0 ) { string dummy, s1, s2; - std::istringstream data( *cmd.getLine(0) ); + std::istringstream data( cmd.getLine(0) ); classic(data); data >> dummy >> s1 >> s2; y2milestone( "dummy:\"%s\" s1:\"%s\" s2:\"%s\"", dummy.c_str(), Modified: trunk/storage/libstorage/src/Dm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.cc?rev… ============================================================================== --- trunk/storage/libstorage/src/Dm.cc (original) +++ trunk/storage/libstorage/src/Dm.cc Thu Feb 26 12:27:26 2009 @@ -63,7 +63,7 @@ " inactive:" << inactiv); if( c.numLines()>0 ) { - string line = *c.getLine(0); + string line = c.getLine(0); target = extractNthWord( 2, line ); if( target=="striped" ) extractNthWord( 3, line ) >> stripe; @@ -77,7 +77,7 @@ unsigned long le; string dev; string majmin; - string line = *c.getLine(i); + string line = c.getLine(i); if( target=="linear" ) { extractNthWord( 1, line ) >> le; @@ -209,17 +209,17 @@ " -m " + *(++ls.begin()) + " | sed -e \"s/:.*//\"" ); if( c.retcode()==0 && c.numLines()>0 ) { - string tmp = "/dev/"+*c.getLine(0); + string tmp = "/dev/" + c.getLine(0); if( cont->getStorage()->knownDevice( tmp, true ) ) { ret = tmp; } else { - c.execute(DMSETUPBIN " table " + quote(*c.getLine(0))); + c.execute(DMSETUPBIN " table " + quote(c.getLine(0))); if( c.retcode()==0 && c.numLines()>0 ) { - pair = extractNthWord( 3, *c.getLine(0) ); + pair = extractNthWord( 3, c.getLine(0) ); ret = cont->getStorage()->deviceByNumber( pair ); } } @@ -494,7 +494,7 @@ SystemCmd c(DMSETUPBIN " -c --noheadings info " + quote(table)); if( c.retcode()==0 && c.numLines()>0 ) { - list<string> sl = splitString( *c.getLine(0), ":" ); + list<string> sl = splitString( c.getLine(0), ":" ); if( sl.size()>=3 ) { list<string>::const_iterator ci = sl.begin(); Modified: trunk/storage/libstorage/src/DmCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/DmCo.cc (original) +++ trunk/storage/libstorage/src/DmCo.cc Thu Feb 26 12:27:26 2009 @@ -83,7 +83,7 @@ string cipher, keysize; for( unsigned int i = 0; i < c.numLines(); i++) { - string line = *c.getLine(i); + string line = c.getLine(i); string key = extractNthWord( 0, line ); if( key == "cipher:" ) cipher = extractNthWord( 1, line ); @@ -118,7 +118,7 @@ SystemCmd c(DMSETUPBIN " ls | grep \"(.*)\"" ); for( unsigned i=0; i<c.numLines(); ++i ) { - string line = *c.getLine(i); + string line = c.getLine(i); string table = extractNthWord( 0, line ); bool found=false; Storage::ConstLvmLvIterator i=lv.begin(); Modified: trunk/storage/libstorage/src/DmmultipathCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/DmmultipathCo.cc (original) +++ trunk/storage/libstorage/src/DmmultipathCo.cc Thu Feb 26 12:27:26 2009 @@ -41,7 +41,7 @@ if (c.numLines() > 0) { - string line = *c.getLine(0); + string line = c.getLine(0); y2mil("mp line:" << line); string unit = extractNthWord(0, line); @@ -63,7 +63,7 @@ list<string> devs; for (unsigned int i = 1; i < c.numLines(); i++) { - string line = *c.getLine(i); + string line = c.getLine(i); if (boost::starts_with(line, " \\_")) { y2mil("mp element:" << line); @@ -168,12 +168,12 @@ unsigned i=0; if( i<c.numLines() ) - line = *c.getLine(i); + line = c.getLine(i); while( i<c.numLines() ) { while( i<c.numLines() && (line.empty() || !isalnum(line[0]))) if( ++i<c.numLines() ) - line = *c.getLine(i); + line = c.getLine(i); y2mil("mp line:" << line); @@ -183,7 +183,7 @@ list<string> mp_list; if( ++i<c.numLines() ) - line = *c.getLine(i); + line = c.getLine(i); while( i<c.numLines() && (line.empty() || !isalnum(line[0]))) { if (boost::starts_with(line, " \\_")) @@ -194,7 +194,7 @@ mp_list.push_back(dev); } if( ++i<c.numLines() ) - line = *c.getLine(i); + line = c.getLine(i); } y2mil( "mp_list:" << mp_list ); if (mp_list.size() >= 1) Modified: trunk/storage/libstorage/src/DmraidCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmraidCo.… ============================================================================== --- trunk/storage/libstorage/src/DmraidCo.cc (original) +++ trunk/storage/libstorage/src/DmraidCo.cc Thu Feb 26 12:27:26 2009 @@ -38,7 +38,7 @@ list<string>::const_iterator ci; list<string> sl; if( c.numLines()>0 ) - sl = splitString( *c.getLine(0), ":" ); + sl = splitString( c.getLine(0), ":" ); Pv *pve = new Pv; if( sl.size()>=4 ) { @@ -49,7 +49,7 @@ unsigned num = 1; while( num<c.numLines() ) { - sl = splitString( *c.getLine(num), ":" ); + sl = splitString( c.getLine(num), ":" ); y2mil( "sl:" << sl ); if( sl.size()>=3 ) { @@ -133,7 +133,7 @@ SystemCmd c(DMRAIDBIN " -s -c -c -c"); for( unsigned i=0; i<c.numLines(); ++i ) { - list<string> sl = splitString( *c.getLine(i), ":" ); + list<string> sl = splitString( c.getLine(i), ":" ); if( sl.size()>=3 ) { list<string>::const_iterator ci = sl.begin(); Modified: trunk/storage/libstorage/src/LvmLv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmLv.cc?… ============================================================================== --- trunk/storage/libstorage/src/LvmLv.cc (original) +++ trunk/storage/libstorage/src/LvmLv.cc Thu Feb 26 12:27:26 2009 @@ -114,7 +114,7 @@ { for (unsigned int l = 1; l < cmd.numLines(); l++) { - string line = *cmd.getLine(l); + string line = cmd.getLine(l); if (extractNthWord(0, line) == name()) { Modified: trunk/storage/libstorage/src/LvmVg.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.cc?… ============================================================================== --- trunk/storage/libstorage/src/LvmVg.cc (original) +++ trunk/storage/libstorage/src/LvmVg.cc Thu Feb 26 12:27:26 2009 @@ -641,10 +641,10 @@ string::size_type pos; while( i<cnt ) { - line = *c.getLine( i++ ); + line = c.getLine( i++ ); if( line.find( "Volume group" )!=string::npos ) { - line = *c.getLine( i++ ); + line = c.getLine( i++ ); while( line.find( "Logical volume" )==string::npos && line.find( "Physical volume" )==string::npos && i<cnt ) @@ -689,7 +689,7 @@ { uuid = extractNthWord( 2, line ); } - line = *c.getLine( i++ ); + line = c.getLine( i++ ); } string vname; string origin; @@ -747,7 +747,7 @@ { uuid = extractNthWord( 2, line ); } - line = *c.getLine( i++ ); + line = c.getLine( i++ ); } if( !vname.empty() ) { @@ -778,7 +778,7 @@ extractNthWord( 5, line ) >> p->num_pe; extractNthWord( 7, line ) >> p->free_pe; } - line = *c.getLine( i++ ); + line = c.getLine( i++ ); } if( !p->device.empty() ) { @@ -1124,7 +1124,7 @@ for( unsigned i=0; i<c.numLines(); ++i ) { - string vgname = *c.getLine(i); + string vgname = c.getLine(i); string::size_type pos=vgname.find_first_not_of( app_ws+"\"" ); if( pos>0 ) vgname.erase( 0, pos ); @@ -1537,7 +1537,7 @@ c.execute( "devmap_name "+dm+":"+i->device.substr( 8 ) ); if( c.retcode()==0 ) { - string dev = "/dev/" + *c.getLine( 0 ); + string dev = "/dev/" + c.getLine( 0 ); y2mil( "dev:" << i->device << " normal dev:" << dev ); if( getStorage()->knownDevice( dev ) ) { Modified: trunk/storage/libstorage/src/Md.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Md.cc?rev… ============================================================================== --- trunk/storage/libstorage/src/Md.cc (original) +++ trunk/storage/libstorage/src/Md.cc Thu Feb 26 12:27:26 2009 @@ -49,21 +49,21 @@ string::size_type pos; if( c.retcode()==0 && c.numLines(true)>0 ) { - md_uuid = *c.getLine(0,true); + md_uuid = c.getLine(0,true); if( (pos=md_uuid.find( "UUID : " ))!=string::npos ) md_uuid.erase( 0, pos+7 ); md_uuid = extractNthWord( 0, md_uuid ); } c.select( "Version : " ); if( c.retcode()==0 && c.numLines(true)>0 ) - sb_ver = extractNthWord( 2, *c.getLine(0,true) ); + sb_ver = extractNthWord( 2, c.getLine(0,true) ); if (c.retcode()==0 && c.numLines(true)>0 ) { - y2mil( "line:\"" << *c.getLine(0,true) << "\"" ); + y2mil( "line:\"" << c.getLine(0,true) << "\"" ); y2mil( "sb_ver:\"" << sb_ver << "\"" ); - y2mil( "word0:\"" << extractNthWord( 0, *c.getLine(0,true)) << "\"" ); - y2mil( "word1:\"" << extractNthWord( 1, *c.getLine(0,true)) << "\"" ); - y2mil( "word2:\"" << extractNthWord( 2, *c.getLine(0,true)) << "\"" ); + y2mil( "word0:\"" << extractNthWord( 0, c.getLine(0,true)) << "\"" ); + y2mil( "word1:\"" << extractNthWord( 1, c.getLine(0,true)) << "\"" ); + y2mil( "word2:\"" << extractNthWord( 2, c.getLine(0,true)) << "\"" ); } string tmp; string line = line1; @@ -260,7 +260,7 @@ c.select("State : "); if( c.retcode()==0 && c.numLines(true)>0 ) { - string state = *c.getLine(0,true); + string state = c.getLine(0,true); string::size_type pos; if( (pos=state.find( "State : " ))!=string::npos ) state.erase( 0, pos+8 ); Modified: trunk/storage/libstorage/src/ProcMounts.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcMount… ============================================================================== --- trunk/storage/libstorage/src/ProcMounts.cc (original) +++ trunk/storage/libstorage/src/ProcMounts.cc Thu Feb 26 12:27:26 2009 @@ -56,7 +56,7 @@ mt.select( (string)" on "+dir+' ' ); if( mt.numLines(true)>0 ) { - list<string> sl = splitString( *mt.getLine(0,true) ); + list<string> sl = splitString( mt.getLine(0,true) ); y2mil( "sl:" << sl ); if( sl.size()>=6 ) { @@ -93,8 +93,8 @@ mt.select( " / " ); if( mt.numLines()>0 ) { - y2mil( "root mount:" << *mt.getLine(0,true) ); - string dev = extractNthWord( 0, *mt.getLine(0,true)); + y2mil( "root mount:" << mt.getLine(0,true) ); + string dev = extractNthWord( 0, mt.getLine(0,true)); if( !dev.empty() && dev[0]!='/' ) { dev = sto->findNormalDevice( dev ); Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Thu Feb 26 12:27:26 2009 @@ -225,7 +225,7 @@ if( testmode ) { - SystemCmd::testmode = true; + SystemCmd::setTestmode(); rootprefix = testdir; fstab = new EtcFstab( rootprefix ); string t = testdir+"/volume_info"; @@ -250,7 +250,7 @@ SystemCmd rm; for( unsigned i=0; i<c.numLines(); i++ ) { - rm.execute(MDADMBIN " --stop " + quote("/dev/" + extractNthWord(0, *c.getLine(i)))); + rm.execute(MDADMBIN " --stop " + quote("/dev/" + extractNthWord(0, c.getLine(i)))); } } delete ppart; @@ -848,8 +848,7 @@ SystemCmd c("/usr/bin/md5sum " + quote(n1) + " " + quote(n2)); if( c.retcode()==0 && c.numLines()>=2 ) { - ret = extractNthWord( 0, *c.getLine(0) )== - extractNthWord( 0, *c.getLine(1) ); + ret = extractNthWord( 0, c.getLine(0) ) == extractNthWord( 0, c.getLine(1) ); } } y2mil("ret:" << ret << "n1:" << n1 << " n2:" << n2); @@ -3725,7 +3724,7 @@ SystemCmd c( "ps ax | grep -w /usr/sbin/hald | grep -v grep" ); if( c.numLines()>0 ) { - extractNthWord( 0, *c.getLine(0) ) >> hald_pid; + extractNthWord( 0, c.getLine(0) ) >> hald_pid; y2mil( "hald_pid:" << hald_pid ); } if( hald_pid>0 ) @@ -4575,7 +4574,7 @@ unsigned line=0; while( line<c.numLines() ) { - removeDmTable( *c.getLine(line) ); + removeDmTable( c.getLine(line) ); line++; } } @@ -5444,12 +5443,13 @@ SystemCmd c("/usr/sbin/ntfsresize -f -i " + quote(device)); string fstr = " might resize at "; string::size_type pos; - if (c.retcode()==0 && (pos=c.stdout().find(fstr))!=string::npos) + string stdout = c.stdout(); + if (c.retcode()==0 && (pos=stdout.find(fstr))!=string::npos) { y2mil("pos:" << pos); - pos = c.stdout().find_first_not_of(" \t\n", pos + fstr.size()); + pos = stdout.find_first_not_of(" \t\n", pos + fstr.size()); y2mil("pos:" << pos); - string number = c.stdout().substr(pos, c.stdout().find_first_not_of("0123456789", pos)); + string number = stdout.substr(pos, stdout.find_first_not_of("0123456789", pos)); y2mil("number:\"" << number << "\""); unsigned long long t; number >> t; Modified: trunk/storage/libstorage/src/SystemCmd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd… ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.cc (original) +++ trunk/storage/libstorage/src/SystemCmd.cc Thu Feb 26 12:27:26 2009 @@ -29,6 +29,7 @@ execute( Command ); } + SystemCmd::SystemCmd( const string& Command_Cv ) { y2mil("constructor SystemCmd:\"" << Command_Cv << "\""); @@ -36,12 +37,14 @@ execute( Command_Cv ); } + SystemCmd::SystemCmd() { y2mil("constructor SystemCmd"); init(); } + void SystemCmd::init() { Combine_b = false; @@ -52,6 +55,7 @@ pfds[0].events = pfds[1].events = POLLIN; } + SystemCmd::~SystemCmd() { if( File_aC[IDX_STDOUT] ) @@ -60,14 +64,15 @@ fclose( File_aC[IDX_STDERR] ); } + void -SystemCmd::setOutputHandler( void (*Handle_f)( void *, string, bool ), - void * Par_p ) +SystemCmd::setOutputHandler( void (*Handle_f)( void *, string, bool ), void * Par_p ) { OutputHandler_f = Handle_f; HandlerPar_p = Par_p; } + void SystemCmd::closeOpenFds() { @@ -99,8 +104,7 @@ int SystemCmd::executeRestricted( const string& Command_Cv, - long unsigned MaxTimeSec, - long unsigned MaxLineOut, + long unsigned MaxTimeSec, long unsigned MaxLineOut, bool& ExceedTime, bool& ExceedLines ) { y2mil("cmd:" << Command_Cv << " MaxTime:" << MaxTimeSec << " MaxLines:" << MaxLineOut); @@ -349,29 +353,34 @@ return Wait_ii != 0; } + void -SystemCmd::setCombine( const bool Comb_bv ) - { - Combine_b = Comb_bv; - } +SystemCmd::setCombine(bool val) +{ + Combine_b = val; +} -const string * -SystemCmd::getString( unsigned Idx_iv ) const + +void +SystemCmd::setTestmode(bool val) +{ + testmode = val; +} + + +string +SystemCmd::getString( OutputStream Idx_iv ) const { if( Idx_iv > 1 ) { y2err("invalid index " << Idx_iv); } - if( !Valid_ab[Idx_iv] ) - { - Text_aC[Idx_iv] = boost::join(Lines_aC[Idx_iv], "\n"); - Valid_ab[Idx_iv] = true; - } - return &Text_aC[Idx_iv]; + return boost::join(Lines_aC[Idx_iv], "\n"); } + unsigned -SystemCmd::numLines( bool Sel_bv, unsigned Idx_iv ) const +SystemCmd::numLines( bool Sel_bv, OutputStream Idx_iv ) const { unsigned Ret_ii; @@ -391,10 +400,11 @@ return Ret_ii; } -const string * -SystemCmd::getLine( unsigned Nr_iv, bool Sel_bv, unsigned Idx_iv ) const + +string +SystemCmd::getLine( unsigned Nr_iv, bool Sel_bv, OutputStream Idx_iv ) const { - const string * Ret_pCi = NULL; + string ret; if( Idx_iv > 1 ) { @@ -404,21 +414,22 @@ { if( Nr_iv < SelLines_aC[Idx_iv].capacity() ) { - Ret_pCi = SelLines_aC[Idx_iv][Nr_iv]; + ret = *SelLines_aC[Idx_iv][Nr_iv]; } } else { if( Nr_iv < Lines_aC[Idx_iv].size() ) { - Ret_pCi = &Lines_aC[Idx_iv][Nr_iv]; + ret = Lines_aC[Idx_iv][Nr_iv]; } } - return Ret_pCi; + return ret; } + int -SystemCmd::select( string Pat_Cv, bool Invert_bv, unsigned Idx_iv ) +SystemCmd::select( string Pat_Cv, bool Invert_bv, OutputStream Idx_iv ) { int I_ii; int End_ii; @@ -460,14 +471,12 @@ return Size_ii; } + void SystemCmd::invalidate() { - int Idx_ii; - - for( Idx_ii=0; Idx_ii<2; Idx_ii++ ) + for (int Idx_ii = 0; Idx_ii < 2; Idx_ii++) { - Valid_ab[Idx_ii] = false; SelLines_aC[Idx_ii].resize(0); Lines_aC[Idx_ii].clear(); NewLineSeen_ab[Idx_ii] = true; @@ -559,6 +568,7 @@ } } + void SystemCmd::extractNewline( const char* Buf_ti, int Cnt_iv, bool& NewLine_br, string& Text_Cr, vector<string>& Lines_Cr ) @@ -603,9 +613,9 @@ SystemCmd::logOutput() const { for (unsigned i = 0; i < numLines(false, IDX_STDERR); ++i) - y2mil("stderr:" << *getLine(i, false, IDX_STDERR)); + y2mil("stderr:" << getLine(i, false, IDX_STDERR)); for (unsigned i = 0; i < numLines(false, IDX_STDOUT); ++i) - y2mil("stdout:" << *getLine(i, false, IDX_STDOUT)); + y2mil("stdout:" << getLine(i, false, IDX_STDOUT)); } Modified: trunk/storage/libstorage/src/SystemCmd.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd… ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.h (original) +++ trunk/storage/libstorage/src/SystemCmd.h Thu Feb 26 12:27:26 2009 @@ -18,33 +18,38 @@ class SystemCmd { public: + enum OutputStream { IDX_STDOUT, IDX_STDERR }; + SystemCmd( const char* Command_Cv ); SystemCmd( const string& Command_Cv ); SystemCmd(); + virtual ~SystemCmd(); + int execute( const string& Command_Cv ); int executeBackground( const string& Command_Cv ); int executeRestricted( const string& Command_Cv, - unsigned long MaxTimeSec, - unsigned long MaxLineOut, + unsigned long MaxTimeSec, unsigned long MaxLineOut, bool& ExceedTime, bool& ExceedLines); - void setOutputHandler( void (*Handle_f)( void *, string, bool ), - void * Par_p ); + + void setOutputHandler( void (*Handle_f)( void *, string, bool ), void * Par_p ); + void setOutputProcessor( OutputProcessor * proc ) { output_proc = proc; } void logOutput() const; - void setOutputProcessor( OutputProcessor * proc ) - { output_proc = proc; } - int select( string Reg_Cv, bool Invert_bv=false, - unsigned Idx_ii=IDX_STDOUT ); - const string& stderr() const { return( *getString(IDX_STDERR)); } - const string& stdout() const { return( *getString(IDX_STDOUT)); } - const string& cmd() const { return( lastCmd ); } - const string* getLine( unsigned Num_iv, bool Selected_bv=false, - unsigned Idx_ii=IDX_STDOUT ) const; - unsigned numLines( bool Selected_bv=false, unsigned Idx_ii=IDX_STDOUT ) const; - void setCombine( const bool Combine_b=true ); + + string stderr() const { return getString(IDX_STDERR); } + string stdout() const { return getString(IDX_STDOUT); } + string cmd() const { return lastCmd; } int retcode() const { return Ret_i; } + int select(string Reg_Cv, bool Invert_bv = false, OutputStream Idx_ii = IDX_STDOUT); + unsigned numLines(bool Selected_bv = false, OutputStream Idx_ii = IDX_STDOUT) const; + string getLine(unsigned Num_iv, bool Selected_bv = false, OutputStream Idx_ii = IDX_STDOUT) const; + + void setCombine(bool combine = true); + + static void setTestmode(bool testmode = true); + /** * Quotes and protects a single string for shell execution. */ @@ -55,8 +60,6 @@ */ static string quote(const std::list<string>& strs); - static bool testmode; - protected: void invalidate(); @@ -71,10 +74,8 @@ void addLine( string Text_Cv, std::vector<string>& Lines_Cr ); void init(); - const string* getString( unsigned Idx_ii=IDX_STDOUT ) const; + string getString(OutputStream Idx_ii = IDX_STDOUT) const; - mutable string Text_aC[2]; - mutable bool Valid_ab[2]; FILE* File_aC[2]; std::vector<string> Lines_aC[2]; std::vector<string*> SelLines_aC[2]; @@ -89,6 +90,8 @@ OutputProcessor* output_proc; struct pollfd pfds[2]; + static bool testmode; + }; Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Thu Feb 26 12:27:26 2009 @@ -347,7 +347,7 @@ } if( found ) { - list<string> l = splitString( *loopData.getLine( 0, true )); + list<string> l = splitString( loopData.getLine( 0, true )); std::ostringstream b; classic(b); b << "line[" << device() << "]=" << l; @@ -400,7 +400,7 @@ } if( found ) { - list<string> l = splitString( *blkidData.getLine( 0, true ), " \t\n", + list<string> l = splitString( blkidData.getLine( 0, true ), " \t\n", true, true, "\"" ); std::ostringstream b; classic(b); -- 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] r55786 - /tags/branch-Code-11-2_17_74/network/
by jsrain＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: jsrain Date: Thu Feb 26 12:13:13 2009 New Revision: 55786 URL: http://svn.opensuse.org/viewcvs/yast?rev=55786&view=rev Log: Created tag branch-Code-11-2_17_74 for network Added: tags/branch-Code-11-2_17_74/network/ - copied from r55785, branches/SuSE-Code-11-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