February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55765 - /tags/stable-2_18_0/firstboot/
by jsuchome＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: jsuchome Date: Wed Feb 25 19:21:04 2009 New Revision: 55765 URL: http://svn.opensuse.org/viewcvs/yast?rev=55765&view=rev Log: Created tag stable-2_18_0 for firstboot Added: tags/stable-2_18_0/firstboot/ - copied from r55764, trunk/firstboot/ -- 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] r55764 - in /trunk/firstboot: ./ package/ scripts/Firstboot-Stage/ src/
by jsuchome＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: jsuchome Date: Wed Feb 25 19:20:59 2009 New Revision: 55764 URL: http://svn.opensuse.org/viewcvs/yast?rev=55764&view=rev Log: - start the services before YaST (bnc#475169) - set the reasonable value for LC_ALL (bnc#478812) - retranslate wizard steps after language change (bnc#479571) - 2.18.0 Added: trunk/firstboot/scripts/Firstboot-Stage/S06-services (with props) trunk/firstboot/scripts/Firstboot-Stage/S08-start (contents, props changed) - copied, changed from r55722, trunk/firstboot/scripts/Firstboot-Stage/S04-start trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup (contents, props changed) - copied, changed from r55722, trunk/firstboot/scripts/Firstboot-Stage/S05-cleanup Removed: trunk/firstboot/scripts/Firstboot-Stage/S04-start trunk/firstboot/scripts/Firstboot-Stage/S05-cleanup Modified: trunk/firstboot/VERSION trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/scripts/Firstboot-Stage/Makefile.am trunk/firstboot/scripts/Firstboot-Stage/S03-language trunk/firstboot/src/firstboot_language.ycp Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=55764&r1=5… ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Wed Feb 25 19:20:59 2009 @@ -1 +1 @@ -2.17.5 +2.18.0 Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Wed Feb 25 19:20:59 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Feb 25 19:17:47 CET 2009 - jsuchome(a)suse.cz + +- start the services before YaST (bnc#475169) +- set the reasonable value for LC_ALL (bnc#478812) +- retranslate wizard steps after language change (bnc#479571) +- 2.18.0 + +------------------------------------------------------------------- Fri Jan 9 15:37:55 CET 2009 - ug(a)suse.de - firstboot.desktop file moved from autoyast2 package to this Modified: trunk/firstboot/scripts/Firstboot-Stage/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/scripts/Firstboot-Stag… ============================================================================== --- trunk/firstboot/scripts/Firstboot-Stage/Makefile.am (original) +++ trunk/firstboot/scripts/Firstboot-Stage/Makefile.am Wed Feb 25 19:20:59 2009 @@ -6,7 +6,8 @@ ystartupbin_SCRIPTS = \ S02-logging \ S03-language \ - S04-start \ - S05-cleanup + S06-services \ + S08-start \ + S09-cleanup EXTRA_DIST = $(ystartupbin_SCRIPTS) Modified: trunk/firstboot/scripts/Firstboot-Stage/S03-language URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/scripts/Firstboot-Stag… ============================================================================== --- trunk/firstboot/scripts/Firstboot-Stage/S03-language (original) +++ trunk/firstboot/scripts/Firstboot-Stage/S03-language Wed Feb 25 19:20:59 2009 @@ -8,6 +8,7 @@ langfile=/etc/sysconfig/language eval `grep "^[[:space:]]*RC_LANG=" $langfile 2>/dev/null` set_language_cont +export LC_ALL=$LANG log "\tLanguage set to: $LANG" #============================================= Added: trunk/firstboot/scripts/Firstboot-Stage/S06-services URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/scripts/Firstboot-Stag… ============================================================================== --- trunk/firstboot/scripts/Firstboot-Stage/S06-services (added) +++ trunk/firstboot/scripts/Firstboot-Stage/S06-services Wed Feb 25 19:20:59 2009 @@ -0,0 +1,54 @@ +#!/bin/sh +log "Starting S06-services..." +log "========================" + +#============================================= +# 9) start services +#--------------------------------------------- +if [ -x /sbin/rcpcmcia ] ; then +if [ -r /etc/sysconfig/pcmcia ];then + # /.../ + # To start the pcmcia subsystem we need to set the following + # variables within /etc/sysconfig/pcmcia file + # --- + TMP=`/bin/mktemp /tmp/sysconfig.pcmcia.XXXXXX` + ISI=/etc/install.inf + RCC=/etc/sysconfig/pcmcia + cp $RCC $TMP + CORE=`sed -n "/^options/s/^.*pcmcia_core //p" $ISI` + PCIC=`sed -n "/^options/s/^.*$i82365\|tcic$ //p" $ISI` + sed -e "/^PCMCIA_CORE_OPTS/s/=.*$/=\"$CORE\"/" \ + -e "/^PCMCIA_PCIC_OPTS/s/=.*$/=\"$PCIC\"/" $TMP > $RCC + rm $TMP + # /.../ + # It does not matter whether pcmcia is already active or not because: + # 1) loading an already loaded module does not harm + # 2) the cardmgr is already dead. cardmgr was the same binary as linuxrc. + # 3) there is no configuration info in network.opts, so eth0 will stay + # completely untouched and its state is "up" + # --- + # We are safe to start the subsystem now + # --- + if grep -qs '^PCMCIA:' /etc/install.inf ; then + log "\tStarting PCMCIA service..." + log "\tUsing following PCMCIA configuration:" + IFS=" + " + while read line;do + log "\t$line" + done < $RCC + rcpcmcia start + fi +fi +fi + +#============================================= +# 9.1) start hald +#--------------------------------------------- +if [ -x /usr/sbin/rchal ] ; then + test -f /usr/sbin/rcdbus && /usr/sbin/rcdbus start + test -f /usr/sbin/rcacpid && /usr/sbin/rcacpid start + test -f /usr/sbin/rchal && /usr/sbin/rchal start +fi + +sleep 1 Copied: trunk/firstboot/scripts/Firstboot-Stage/S08-start (from r55722, trunk/firstboot/scripts/Firstboot-Stage/S04-start) URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/scripts/Firstboot-Stag… ============================================================================== --- trunk/firstboot/scripts/Firstboot-Stage/S04-start (original) +++ trunk/firstboot/scripts/Firstboot-Stage/S08-start Wed Feb 25 19:20:59 2009 @@ -1,5 +1,5 @@ #!/bin/sh -log "Starting S04-start..." +log "Starting S08-start..." log "=====================" Copied: trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup (from r55722, trunk/firstboot/scripts/Firstboot-Stage/S05-cleanup) URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/scripts/Firstboot-Stag… ============================================================================== --- trunk/firstboot/scripts/Firstboot-Stage/S05-cleanup (original) +++ trunk/firstboot/scripts/Firstboot-Stage/S09-cleanup Wed Feb 25 19:20:59 2009 @@ -1,5 +1,5 @@ #!/bin/sh -log "Starting S10-cleanup..." +log "Starting S09-cleanup..." log "=======================" #============================================= Modified: trunk/firstboot/src/firstboot_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_language… ============================================================================== --- trunk/firstboot/src/firstboot_language.ycp (original) +++ trunk/firstboot/src/firstboot_language.ycp Wed Feb 25 19:20:59 2009 @@ -44,6 +44,7 @@ args["first_run"] = "yes"; result = WFM::CallFunction ("inst_language", [ args ] ); Wizard::RetranslateButtons (); + ProductControl::RetranslateWizardSteps (); } y2milestone ("result '%1'", result); -- 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] r55763 - /trunk/storage/libstorage/src/SystemCmd.cc
by aschnell＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: aschnell Date: Wed Feb 25 18:54:04 2009 New Revision: 55763 URL: http://svn.opensuse.org/viewcvs/yast?rev=55763&view=rev Log: - use boost::join Modified: trunk/storage/libstorage/src/SystemCmd.cc 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 Wed Feb 25 18:54:04 2009 @@ -12,7 +12,7 @@ #include <sys/wait.h> #include <string> -#include <boost/algorithm/string/replace.hpp> +#include <boost/algorithm/string.hpp> #include "y2storage/AppUtil.h" #include "y2storage/SystemCmd.h" @@ -364,16 +364,7 @@ } if( !Valid_ab[Idx_iv] ) { - unsigned int I_ii; - - Text_aC[Idx_iv] = ""; - I_ii=0; - while( I_ii<Lines_aC[Idx_iv].size() ) - { - Text_aC[Idx_iv] += Lines_aC[Idx_iv][I_ii]; - Text_aC[Idx_iv] += '\n'; - I_ii++; - } + Text_aC[Idx_iv] = boost::join(Lines_aC[Idx_iv], "\n"); Valid_ab[Idx_iv] = true; } return &Text_aC[Idx_iv]; -- 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] r55762 - in /trunk/storage/libstorage/src: DmPartCo.cc LvmVg.cc
by aschnell＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: aschnell Date: Wed Feb 25 18:46:36 2009 New Revision: 55762 URL: http://svn.opensuse.org/viewcvs/yast?rev=55762&view=rev Log: - use newer logging functions Modified: trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/LvmVg.cc Modified: trunk/storage/libstorage/src/DmPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.… ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.cc (original) +++ trunk/storage/libstorage/src/DmPartCo.cc Wed Feb 25 18:46:36 2009 @@ -78,8 +78,7 @@ DmPartCo::createPartition( storage::PartitionType type, long unsigned start, long unsigned len, string& device, bool checkRelaxed ) { - y2milestone( "begin type %d at %ld len %ld relaxed:%d", type, start, len, - checkRelaxed ); + y2mil("begin type:" << type << " start:" << start << " len:" << len << " relaxed:" << checkRelaxed); int ret = disk ? 0 : DMPART_INTERNAL_ERR; if( ret==0 && readonly() ) ret = DMPART_CHANGE_READONLY; @@ -94,7 +93,7 @@ int DmPartCo::createPartition( long unsigned len, string& device, bool checkRelaxed ) { - y2milestone( "len %ld relaxed:%d", len, checkRelaxed ); + y2mil("len:" << len << " relaxed:" << checkRelaxed); int ret = disk ? 0 : DMPART_INTERNAL_ERR; if( ret==0 && readonly() ) ret = DMPART_CHANGE_READONLY; @@ -109,7 +108,7 @@ int DmPartCo::createPartition( storage::PartitionType type, string& device ) { - y2milestone( "type %u", type ); + y2mil("type:" << type); int ret = disk ? 0 : DMPART_INTERNAL_ERR; if( ret==0 && readonly() ) ret = DMPART_CHANGE_READONLY; @@ -540,8 +539,7 @@ int DmPartCo::doSetType( DmPart* dm ) { - y2milestone( "doSetType container %s name %s", name().c_str(), - dm->name().c_str() ); + y2mil("doSetType container " << name() << " name " << dm->name()); Partition * p = dm->getPtr(); int ret = p?0:DMPART_PARTITION_NOT_FOUND; if( ret==0 ) @@ -658,7 +656,7 @@ list<Volume*>& vol ) { int ret = 0; - y2milestone( "ret:%d col:%zd vol:%zd", ret, col.size(), vol.size()); + y2mil("col:" << col.size() << " vol:" << vol.size()); getStorage()->logCo( this ); unsigned long oco = col.size(); unsigned long ovo = vol.size(); @@ -673,7 +671,7 @@ if( del_ptable && find( col.begin(), col.end(), this )==col.end() ) col.push_back( this ); if( col.size()!=oco || vol.size()!=ovo ) - y2milestone( "ret:%d col:%zd vol:%zd", ret, col.size(), vol.size()); + y2mil("ret:" << ret << " col:" << col.size() << " vol:" << vol.size()); return( ret ); } @@ -745,7 +743,7 @@ int DmPartCo::doCreate( Volume* v ) { - y2milestone( "Raid:%s part:%s", name().c_str(), v->name().c_str() ); + y2mil("DmPart:" << name() << " name:" << v->name()); DmPart * l = dynamic_cast<DmPart *>(v); int ret = disk ? 0 : DMPART_INTERNAL_ERR; if( ret==0 && l == NULL ) @@ -790,7 +788,7 @@ int DmPartCo::doRemove( Volume* v ) { - y2milestone( "Raid:%s name:%s", name().c_str(), v->name().c_str() ); + y2mil("DmPart:" << name() << " name:" << v->name()); DmPart * l = dynamic_cast<DmPart *>(v); bool save_act = false; int ret = disk ? 0 : DMPART_INTERNAL_ERR; @@ -833,7 +831,7 @@ int DmPartCo::doResize( Volume* v ) { - y2milestone( "DmPart:%s name:%s", name().c_str(), v->name().c_str() ); + y2mil("DmPart:" << name() << " name:" << v->name()); DmPart * l = dynamic_cast<DmPart *>(v); int ret = disk ? 0 : DMPART_INTERNAL_ERR; if( ret==0 && l == NULL ) 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 Wed Feb 25 18:46:36 2009 @@ -225,7 +225,7 @@ LvmVg::setPeSize( long long unsigned peSizeK ) { int ret = 0; - y2milestone( "old:%llu new:%llu", pe_size, peSizeK ); + y2mil("old:" << pe_size << " new:" << peSizeK); if( peSizeK != pe_size ) { unsigned long long old_pe = pe_size; @@ -250,7 +250,7 @@ string& device ) { int ret = 0; - y2milestone( "name:%s sizeK:%llu stripe:%u", name.c_str(), sizeK, stripe ); + y2mil("name:" << name << " sizeK:" << sizeK << " stripe:" << stripe); checkConsistency(); if( readonly() ) { @@ -290,14 +290,14 @@ } if( ret==0 ) checkConsistency(); - y2milestone( "ret:%d device:%s", ret, ret?"":device.c_str() ); + y2mil("ret:" << ret << " device:" << (ret?"":device)); return( ret ); } int LvmVg::resizeVolume( Volume* v, unsigned long long newSize ) { int ret = 0; - y2milestone( "newSizeK:%llu vol:%s", newSize, v->name().c_str() ); + y2mil("newSizeK:" << newSize << " vol:" << v->name()); checkConsistency(); LvmLv * l = dynamic_cast<LvmLv *>(v); @@ -827,7 +827,7 @@ } if( num_lv>0 && lvmLvPair().empty() ) { - y2milestone( "inactive VG %s num_lv:%u", nm.c_str(), num_lv ); + y2mil("inactive VG " << nm << " num_lv:" << num_lv); inactiv = true; } } @@ -923,7 +923,7 @@ } } if( col.size()!=oco || vol.size()!=ovo ) - y2milestone( "ret:%d col:%zd vol:%zd", ret, col.size(), vol.size()); + y2mil("ret:" << ret << " col:" << col.size() << " vol:" << vol.size()); return( ret ); } -- 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] r55761 - /trunk/storage/libstorage/src/AppUtil.cc
by aschnell＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: aschnell Date: Wed Feb 25 18:46:15 2009 New Revision: 55761 URL: http://svn.opensuse.org/viewcvs/yast?rev=55761&view=rev Log: - log bools as strings Modified: trunk/storage/libstorage/src/AppUtil.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 Wed Feb 25 18:46:15 2009 @@ -364,6 +364,7 @@ prepareLogStream(std::ostringstream& s) { s.imbue(std::locale::classic()); + s.setf(std::ios::boolalpha); s.setf(std::ios::showbase); } -- 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] r55760 - /trunk/storage/libstorage/src/SystemCmd.cc
by aschnell＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: aschnell Date: Wed Feb 25 18:41:24 2009 New Revision: 55760 URL: http://svn.opensuse.org/viewcvs/yast?rev=55760&view=rev Log: - use newer logging functions Modified: trunk/storage/libstorage/src/SystemCmd.cc 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 Wed Feb 25 18:41:24 2009 @@ -187,14 +187,12 @@ bool ok_bi = true; if( !testmode && pipe(sout)<0 ) { - y2error( "pipe stdout creation failed errno=%d (%s)", errno, - strerror(errno)); + y2err("pipe stdout creation failed errno:" << errno << " (" << strerror(errno) << ")"); ok_bi = false; } if( !testmode && !Combine_b && pipe(serr)<0 ) { - y2error( "pipe stderr creation failed errno=%d (%s)", errno, - strerror(errno)); + y2err("pipe stderr creation failed errno:" << errno << " (" << strerror(errno) << ")"); ok_bi = false; } if( !testmode && ok_bi ) @@ -202,19 +200,17 @@ pfds[0].fd = sout[0]; if( fcntl( pfds[0].fd, F_SETFL, O_NONBLOCK )<0 ) { - y2error( "fcntl O_NONBLOCK failed errno=%d (%s)", errno, - strerror(errno)); + y2err("fcntl O_NONBLOCK failed errno:" << errno << " (" << strerror(errno) << ")"); } if( !Combine_b ) { pfds[1].fd = serr[0]; if( fcntl( pfds[1].fd, F_SETFL, O_NONBLOCK )<0 ) { - y2error( "fcntl O_NONBLOCK failed errno=%d (%s)", errno, - strerror(errno)); + y2err("fcntl O_NONBLOCK failed errno:" << errno << " (" << strerror(errno) << ")"); } } - y2debug( "sout:%d serr:%d", pfds[0].fd, Combine_b?-1:pfds[1].fd ); + y2deb("sout:" << pfds[0].fd << " serr:" << (Combine_b?-1:pfds[1].fd)); switch( (Pid_i=fork()) ) { case 0: @@ -222,34 +218,28 @@ setenv( "LANGUAGE", "C", 1 ); if( dup2( sout[1], 1 )<0 ) { - y2error( "dup2 stdout child failed errno=%d (%s)", errno, - strerror(errno)); + y2err("dup2 stdout child failed errno:" << errno << " (" << strerror(errno) << ")"); } if( !Combine_b && dup2( serr[1], 2 )<0 ) { - y2error( "dup2 stderr child failed errno=%d (%s)", errno, - strerror(errno)); + y2err("dup2 stderr child failed errno:" << errno << " (" << strerror(errno) << ")"); } if( Combine_b && dup2( 1, 2 )<0 ) { - y2error( "dup2 stderr child failed errno=%d (%s)", errno, - strerror(errno)); + y2err("dup2 stderr child failed errno:" << errno << " (" << strerror(errno) << ")"); } if( close( sout[0] )<0 ) { - y2error( "close child failed errno=%d (%s)", errno, - strerror(errno)); + y2err("close child failed errno:" << errno << " (" << strerror(errno) << ")"); } if( !Combine_b && close( serr[0] )<0 ) { - y2error( "close child failed errno=%d (%s)", errno, - strerror(errno)); + y2err("close child failed errno:" << errno << " (" << strerror(errno) << ")"); } closeOpenFds(); Ret_i = execl( Shell_Ci.c_str(), Shell_Ci.c_str(), "-c", Cmd.c_str(), NULL ); - y2error( "SHOULD NOT HAPPEN \"%s\" Ret:%d", Shell_Ci.c_str(), - Ret_i ); + y2err("SHOULD NOT HAPPEN \"" << Shell_Ci << "\" Ret:" << Ret_i); break; case -1: Ret_i = -1; @@ -257,28 +247,24 @@ default: if( close( sout[1] )<0 ) { - y2error( "close parent failed errno=%d (%s)", errno, - strerror(errno)); + y2err("close parent failed errno:" << errno << " (" << strerror(errno) << ")"); } if( !Combine_b && close( serr[1] )<0 ) { - y2error( "close parent failed errno=%d (%s)", errno, - strerror(errno)); + y2err("close parent failed errno:" << errno << " (" << strerror(errno) << ")"); } Ret_i = 0; File_aC[IDX_STDOUT] = fdopen( sout[0], "r" ); if( File_aC[IDX_STDOUT] == NULL ) { - y2error( "fdopen stdout failed errno=%d (%s)", errno, - strerror(errno)); + y2err("fdopen stdout failed errno:" << errno << " (" << strerror(errno) << ")"); } if( !Combine_b ) { File_aC[IDX_STDERR] = fdopen( serr[0], "r" ); if( File_aC[IDX_STDERR] == NULL ) { - y2error( "fdopen stderr failed errno=%d (%s)", errno, - strerror(errno)); + y2err("fdopen stderr failed errno:" << errno << " (" << strerror(errno) << ")"); } } if( !Background_b ) @@ -319,20 +305,19 @@ do { - y2debug( "[0] id:%d ev:%x [1] fs:%d ev:%x", - pfds[0].fd, (unsigned)pfds[0].events, - Combine_b?-1:pfds[1].fd, Combine_b?0:(unsigned)pfds[1].events ); + 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 ) { - y2error( "poll failed errno=%d (%s)", errno, strerror(errno)); + y2err("poll failed errno:" << errno << " (" << strerror(errno) << ")"); } - y2debug( "poll ret:%d", sel ); + y2deb("poll ret:" << sel); if( sel>0 ) { checkOutput(); } Wait_ii = waitpid( Pid_i, &Status_ii, WNOHANG ); - y2debug( "Wait ret:%d", Wait_ii ); + y2deb("Wait ret:" << Wait_ii); } while( Hang_bv && Wait_ii == 0 ); if( Wait_ii != 0 ) @@ -358,8 +343,9 @@ output_proc->finished(); } } - y2debug( "Wait:%d pid=%d stat=%d Hang:%d Ret:%d", Wait_ii, Pid_i, - Status_ii, Hang_bv, Ret_ir ); + + y2deb("Wait:" << Wait_ii << " pid:" << Pid_i << " stat:" << Status_ii << + " Hang:" << Hang_bv << " Ret:" << Ret_ir); return Wait_ii != 0; } @@ -473,13 +459,13 @@ { SelLines_aC[Idx_iv].resize( Size_ii+1 ); SelLines_aC[Idx_iv][Size_ii] = &Lines_aC[Idx_iv][I_ii]; - y2debug( "Select Added Line %d \"%s\"", Size_ii, - SelLines_aC[Idx_iv][Size_ii]->c_str() ); + y2deb("Select Added Line " << Size_ii << " \"" << *SelLines_aC[Idx_iv][Size_ii] << "\""); Size_ii++; } } - y2milestone( "Pid:%d Idx:%d Pattern:\"%s\" Invert:%d Lines %d", Pid_i, - Idx_iv, Pat_Cv.c_str(), Invert_bv, Size_ii ); + + y2mil("Pid:" << Pid_i << " Idx:" << Idx_iv << " Pattern:\"" << Pat_Cv << "\" Invert:" << + Invert_bv << " Lines:" << Size_ii); return Size_ii; } @@ -497,20 +483,18 @@ } } + void SystemCmd::checkOutput() - { - y2debug( "NewLine out:%d err:%d", NewLineSeen_ab[IDX_STDOUT], - NewLineSeen_ab[IDX_STDERR] ); - if( File_aC[IDX_STDOUT] ) - getUntilEOF( File_aC[IDX_STDOUT], Lines_aC[IDX_STDOUT], - NewLineSeen_ab[IDX_STDOUT], false ); - if( File_aC[IDX_STDERR] ) - getUntilEOF( File_aC[IDX_STDERR], Lines_aC[IDX_STDERR], - NewLineSeen_ab[IDX_STDERR], true ); - y2debug( "NewLine out:%d err:%d", NewLineSeen_ab[IDX_STDOUT], - NewLineSeen_ab[IDX_STDERR] ); - } +{ + y2deb("NewLine out:" << NewLineSeen_ab[IDX_STDOUT] << " err:" << NewLineSeen_ab[IDX_STDERR]); + if (File_aC[IDX_STDOUT]) + getUntilEOF(File_aC[IDX_STDOUT], Lines_aC[IDX_STDOUT], NewLineSeen_ab[IDX_STDOUT], false); + if (File_aC[IDX_STDERR]) + getUntilEOF(File_aC[IDX_STDERR], Lines_aC[IDX_STDERR], NewLineSeen_ab[IDX_STDERR], true); + y2deb("NewLine out:" << NewLineSeen_ab[IDX_STDOUT] << " err:" << NewLineSeen_ab[IDX_STDERR]); +} + #define BUF_LEN 256 @@ -604,7 +588,7 @@ Text_Cr.erase( 0, Idx_ii+1 ); NewLine_br = true; } - y2debug( "Text_Ci:%s NewLine:%d", Text_Cr.c_str(), NewLine_br ); + y2deb("Text_Ci:" << Text_Cr << " NewLine:" << NewLine_br); } -- 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] r55759 - in /trunk/storage/libstorage/src: Disk.cc Storage.cc SystemCmd.h
by aschnell＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: aschnell Date: Wed Feb 25 18:33:06 2009 New Revision: 55759 URL: http://svn.opensuse.org/viewcvs/yast?rev=55759&view=rev Log: - use SystemCmd.{stdout,stderr} instead of SystemCmd.getString Modified: trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/SystemCmd.h 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 Wed Feb 25 18:33:06 2009 @@ -534,8 +534,8 @@ int Disk::checkSystemError( const string& cmd_line, const SystemCmd& cmd ) { - string tmp = *cmd.getString(SystemCmd::IDX_STDERR); - if( tmp.length()>0 ) + string tmp = cmd.stderr(); + if (!tmp.empty()) { y2err("cmd:" << cmd_line); y2err("err:" << tmp); @@ -545,8 +545,8 @@ } system_stderr += tmp; } - tmp = *cmd.getString(SystemCmd::IDX_STDOUT); - if( tmp.length()>0 ) + tmp = cmd.stdout(); + if (!tmp.empty()) { y2mil("cmd:" << cmd_line); y2mil("out:" << tmp); 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 Wed Feb 25 18:33:06 2009 @@ -5444,14 +5444,12 @@ SystemCmd c("/usr/sbin/ntfsresize -f -i " + quote(device)); string fstr = " might resize at "; string::size_type pos; - if( c.retcode()==0 && - (pos=c.getString()->find( fstr ))!=string::npos ) + if (c.retcode()==0 && (pos=c.stdout().find(fstr))!=string::npos) { y2mil("pos:" << pos); - pos = c.getString()->find_first_not_of( " \t\n", pos+fstr.size()); + pos = c.stdout().find_first_not_of(" \t\n", pos + fstr.size()); y2mil("pos:" << pos); - string number = c.getString()->substr( pos, - c.getString()->find_first_not_of( "0123456789", pos )); + string number = c.stdout().substr(pos, c.stdout().find_first_not_of("0123456789", pos)); y2mil("number:\"" << number << "\""); unsigned long long t; number >> t; 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 Wed Feb 25 18:33:06 2009 @@ -39,7 +39,6 @@ const string& stderr() const { return( *getString(IDX_STDERR)); } const string& stdout() const { return( *getString(IDX_STDOUT)); } const string& cmd() const { return( lastCmd ); } - const string* getString( unsigned Idx_ii=IDX_STDOUT ) const; 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; @@ -72,6 +71,8 @@ void addLine( string Text_Cv, std::vector<string>& Lines_Cr ); void init(); + const string* getString( unsigned Idx_ii=IDX_STDOUT ) const; + mutable string Text_aC[2]; mutable bool Valid_ab[2]; FILE* File_aC[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] r55758 - in /trunk/storage/libstorage/src: SystemCmd.cc SystemCmd.h
by aschnell＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: aschnell Date: Wed Feb 25 18:21:03 2009 New Revision: 55758 URL: http://svn.opensuse.org/viewcvs/yast?rev=55758&view=rev Log: - removed unused code 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 Wed Feb 25 18:21:03 2009 @@ -634,44 +634,6 @@ } -/////////////////////////////////////////////////////////////////// -// -// METHOD NAME : SystemCmd::PlaceOutput -// METHOD TYPE : int -// -// INPUT : -// OUTPUT : -// DESCRIPTION : Place stdout/stderr linewise in Ret_Cr -// -int SystemCmd::placeOutput( unsigned Which_iv, vector<string> &Ret_Cr, - const bool Append_bv ) const -{ - if ( !Append_bv ) - Ret_Cr.clear(); - - int Lines_ii = numLines( false, Which_iv ); - - for ( int i_ii = 0; i_ii < Lines_ii; i_ii++ ) - Ret_Cr.push_back( *getLine( i_ii, false, Which_iv ) ); - - return Lines_ii; -} - -int SystemCmd::placeOutput( unsigned Which_iv, list<string> &Ret_Cr, - const bool Append_bv ) const -{ - if ( !Append_bv ) - Ret_Cr.clear(); - - int Lines_ii = numLines( false, Which_iv ); - - for ( int i_ii = 0; i_ii < Lines_ii; i_ii++ ) - Ret_Cr.push_back( *getLine( i_ii, false, Which_iv ) ); - - return Lines_ii; -} - - string SystemCmd::quote(const string& str) { return "'" + boost::replace_all_copy(str, "'", "'\\''") + "'"; 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 Wed Feb 25 18:21:03 2009 @@ -46,15 +46,6 @@ void setCombine( const bool Combine_b=true ); int retcode() const { return Ret_i; } - int getStdout( std::vector<string> &Ret_Cr, const bool Append_bv = false ) const - { return placeOutput( IDX_STDOUT, Ret_Cr, Append_bv); } - int getStderr( std::vector<string> &Ret_Cr, const bool Append_bv = false ) const - { return placeOutput( IDX_STDERR, Ret_Cr, Append_bv); } - int getStdout( std::list<string> &Ret_Cr, const bool Append_bv = false ) const - { return placeOutput( IDX_STDOUT, Ret_Cr, Append_bv); } - int getStderr( std::list<string> &Ret_Cr, const bool Append_bv = false ) const - { return placeOutput( IDX_STDERR, Ret_Cr, Append_bv); } - /** * Quotes and protects a single string for shell execution. */ @@ -69,9 +60,6 @@ protected: - int placeOutput( unsigned Which_iv, std::vector<string> &Ret_Cr, const bool Append_bv ) const; - int placeOutput( unsigned Which_iv, std::list<string> &Ret_Cr, const bool Append_bv ) const; - void invalidate(); void closeOpenFds(); int doExecute( string Cmd_Cv ); -- 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] r55757 - /trunk/devtools/devtools/bin/y2tool
by mvidner＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: mvidner Date: Wed Feb 25 17:56:12 2009 New Revision: 55757 URL: http://svn.opensuse.org/viewcvs/yast?rev=55757&view=rev Log: another hack for bootstrapping Modified: trunk/devtools/devtools/bin/y2tool Modified: trunk/devtools/devtools/bin/y2tool URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/y2tool?rev… ============================================================================== --- trunk/devtools/devtools/bin/y2tool (original) +++ trunk/devtools/devtools/bin/y2tool Wed Feb 25 17:56:12 2009 @@ -23,6 +23,9 @@ y2toolpath=${PREFIX}/share/YaST2/data/devtools/bin if [ `dirname $0` = "." ]; then y2toolpath=. +# another bootstrapping yuck. *hack* +elif [ "$0" = "devtools/bin/y2tool" ]; then + y2toolpath=devtools/bin fi cmd=$1 -- 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] r55756 - in /branches/tmp/lslezak/core: ./ agent-any/doc/ agent-dummy/doc/ agent-ini/doc/ agent-modules/doc/ agent-process/doc/ agent-resolver/doc/ agents-perl/doc/ base/tools/tty_wrapper/ dbus/SCR...
by lslezak＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: lslezak Date: Wed Feb 25 17:54:58 2009 New Revision: 55756 URL: http://svn.opensuse.org/viewcvs/yast?rev=55756&view=rev Log: - merged changes from trunk (rev. 55755) Modified: branches/tmp/lslezak/core/ (props changed) branches/tmp/lslezak/core/agent-any/doc/ag_anyagent.html (props changed) branches/tmp/lslezak/core/agent-dummy/doc/ag_dummy.html (props changed) branches/tmp/lslezak/core/agent-ini/doc/ag_ini.html (props changed) branches/tmp/lslezak/core/agent-modules/doc/ag_modules.html (props changed) branches/tmp/lslezak/core/agent-process/doc/ag_process.html (props changed) branches/tmp/lslezak/core/agent-resolver/doc/ag_resolver.html (props changed) branches/tmp/lslezak/core/agents-perl/doc/ag_modinfo.html (props changed) branches/tmp/lslezak/core/agents-perl/doc/ag_yp_makefile.html (props changed) branches/tmp/lslezak/core/base/tools/tty_wrapper/tty_wrapper.cc branches/tmp/lslezak/core/dbus/SCR_service/ (props changed) branches/tmp/lslezak/core/dbus/namespace_service/Yast_dbus_server.cc (props changed) branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.YaST.modules.conf.in (props changed) branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.YaST.modules.service.in.in (props changed) branches/tmp/lslezak/core/liby2dbus/ (props changed) branches/tmp/lslezak/core/package/yast2-core.changes Modified: branches/tmp/lslezak/core/base/tools/tty_wrapper/tty_wrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/base/tools/t… ============================================================================== --- branches/tmp/lslezak/core/base/tools/tty_wrapper/tty_wrapper.cc (original) +++ branches/tmp/lslezak/core/base/tools/tty_wrapper/tty_wrapper.cc Wed Feb 25 17:54:58 2009 @@ -74,6 +74,32 @@ return true; } +void output(const std::string & s, int fd) +{ + const char *cs = s.c_str(); + while (true) { + ssize_t n = s.size(); + ssize_t w = write(fd, cs, n); + if (w == n) + break; // success + else if (w == -1) { + if (errno == EINTR) { + // perror("gotcha"); // bnc#470645 + } + else { + perror("write"); // other cases + break; + } + } + else { + errno = 0; + perror("short"); + cs += w; + n -= w; + } + } +} + int main(int argc, char **argv) { if (argc > 1) @@ -119,6 +145,11 @@ if (finish) { + // read the remaining pieces + std::string std_out(subprocess.read()); + output(std_out, 1); + std::string err_out(subprocess.readErr()); + output(err_out, 2); // SIGCHLD received, return the exit status return subprocess.close(); } @@ -168,7 +199,7 @@ { // read stdout of the subprocess and print it on stdout std::string std_out(subprocess.read()); - std::cout << std_out; + output(std_out, 1); } // stderr available @@ -176,7 +207,7 @@ { // read stderr of the subprocess and print it on stderr std::string err_out(subprocess.readErr()); - std::cerr << err_out; + output(err_out, 2); } } } @@ -189,4 +220,3 @@ return 1; } } - Modified: branches/tmp/lslezak/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/package/yast… ============================================================================== --- branches/tmp/lslezak/core/package/yast2-core.changes (original) +++ branches/tmp/lslezak/core/package/yast2-core.changes Wed Feb 25 17:54:58 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 25 14:49:33 CET 2009 - mvidner(a)suse.cz + +- Fixed tty_wrapper losing output: stdio was interrupted by SIGCHLD (bnc#470645). + +------------------------------------------------------------------- Thu Jan 29 15:15:57 CET 2009 - aschnell(a)suse.de - added dbus client agent (required for bnc #464453) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0