March 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r45174 - /branches/tmp/bubli/ncurses-pkg/src/
by kmachalkova＠svn.opensuse.org 04 Mar '08

04 Mar '08

Author: kmachalkova Date: Tue Mar 4 09:40:03 2008 New Revision: 45174 URL: http://svn.opensuse.org/viewcvs/yast?rev=45174&view=rev Log: Pkg information handling moved (save the pkg versions view) Added: branches/tmp/bubli/ncurses-pkg/src/NCPkgPackageDetails.cc branches/tmp/bubli/ncurses-pkg/src/NCPkgPackageDetails.h Modified: branches/tmp/bubli/ncurses-pkg/src/Makefile.am branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuView.cc branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuView.h branches/tmp/bubli/ncurses-pkg/src/NCPkgTable.cc branches/tmp/bubli/ncurses-pkg/src/NCPkgTable.h Modified: branches/tmp/bubli/ncurses-pkg/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/Mak… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/Makefile.am (original) +++ branches/tmp/bubli/ncurses-pkg/src/Makefile.am Tue Mar 4 09:40:03 2008 @@ -25,6 +25,7 @@ NCPkgMenuExtras.h \ NCPkgMenuAction.h \ NCPkgMenuHelp.h \ + NCPkgPackageDetails.h \ NCPkgFilterMain.h \ NCPkgPopupDeps.h \ NCPkgPopupDiskspace.h \ @@ -49,6 +50,7 @@ NCPkgMenuExtras.cc \ NCPkgMenuAction.cc \ NCPkgMenuHelp.cc \ + NCPkgPackageDetails.cc \ NCPkgFilterMain.cc \ NCPkgPopupDeps.cc \ NCPkgPopupDiskspace.cc \ Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc Tue Mar 4 09:40:03 2008 @@ -78,19 +78,6 @@ /////////////////////////////////////////////////////////////////// // -// CompFunc -// -//bool sortByName( ZyppSel ptr1, ZyppSel ptr2 ) -//{ -// if ( ptr1->name() < ptr2->name() ) -// { -// return true; -// } -// return false; -//} - -/////////////////////////////////////////////////////////////////// -// // ignore case compare // bool ic_compare ( char c1, char c2 ) @@ -118,7 +105,6 @@ , updateMode( false ) , testMode ( false ) , autoCheck( true ) - , _rpmGroupsTree (0) , pkgList ( 0 ) , depsMenu( 0 ) , viewMenu( 0 ) @@ -205,23 +191,6 @@ saveState (); - _rpmGroupsTree = new YRpmGroupsTree (); - - // get the rpm groups - ZyppPoolIterator b = zyppPkgBegin (); - ZyppPoolIterator e = zyppPkgEnd (); - ZyppPoolIterator i; - - for ( i = b; i != e; ++i ) - { - ZyppPkg zyppPkg = tryCastToZyppPkg( (*i)->theObj() ); - if ( zyppPkg ) - { - _rpmGroupsTree->addRpmGroup (zyppPkg->group ()); - NCDBG << "Adding group: " << zyppPkg->group() << endl; - } - } - // The creation of the popups is moved to createPopups() } @@ -279,23 +248,6 @@ diskspacePopup = new NCPkgPopupDiskspace( wpos( (NCurses::lines() - 15)/2, NCurses::cols()/6 ), testMode ); } -/////////////////////////////////////////////////////////////////// -// -// -// getDefaultRpmGroup() -// -// returns the default RPM group, the packages of this group -// are displayed on PackageSelector start -// -YStringTreeItem * NCPackageSelector::getDefaultRpmGroup() -{ - if ( _rpmGroupsTree && - _rpmGroupsTree->root() ) - return _rpmGroupsTree->root()->firstChild(); - else - return 0; -} - void NCPackageSelector::createFilterMenu() { bool selections; @@ -523,9 +475,9 @@ // change package/patch status //retVal = StatusHandler( event ); retVal = actionMenu->handleEvent( event ); - else if ( event.widget == infoMenu ) + else if ( event.widget == viewMenu ) // show package/patch information - retVal = InformationHandler( event ); + retVal = viewMenu->handleEvent( event ); else if ( event.widget == depsMenu ) retVal = depsMenu->handleEvent( event ); else if ( event.widget == extrasMenu ) @@ -1123,77 +1075,6 @@ return true; } -/////////////////////////////////////////////////////////////////// -// -// fillPackageList -// -// Fills the package table with the list of packages matching -// the selected filter -// -bool NCPackageSelector::fillPackageList( const string & label, YStringTreeItem * rpmGroup ) -{ - NCPkgTable * packageList = PackageList(); - - if ( !packageList ) - { - UIERR << "No valid NCPkgTable widget" << endl; - return false; - } - - // clear the package table - packageList->itemsCleared (); - - // get the package list and sort it - list<ZyppSel> pkgList( zyppPkgBegin (), zyppPkgEnd () ); - pkgList.sort( sortByName ); - - // fill the package table - list<ZyppSel>::iterator listIt; - ZyppPkg pkgPtr; - - - for ( listIt = pkgList.begin(); listIt != pkgList.end(); ++listIt ) - { - ZyppSel selectable = *listIt; - - // Multiple instances of this package may or may not be in the same - // RPM group, so let's check both the installed version (if there - // is any) and the candidate version. - // - // Make sure we emit only one filterMatch() signal if both exist - // and both are in the same RPM group. We don't want multiple list - // entries for the same package! - - bool match = - checkPackage( selectable->candidateObj(), selectable, rpmGroup ) || - checkPackage( selectable->installedObj(), selectable, rpmGroup ); - - // If there is neither an installed nor a candidate package, check - // any other instance. - - if ( ! match && - ! selectable->installedObj() && - ! selectable->candidateObj() ) - checkPackage( selectable->theObj(), selectable, rpmGroup ); - - } - - // show the package list - packageList->drawList(); - - NCMIL << "Fill package list" << endl; - - if ( ! label.empty() ) - { - // show the selected filter label - if ( packageLabel ) - { - packageLabel->setText( label ); - } - } - - return true; -} /////////////////////////////////////////////////////////////////// // @@ -1299,41 +1180,6 @@ } -/////////////////////////////////////////////////////////////////// -// -// checkPackage -// -// -bool NCPackageSelector::checkPackage( ZyppObj opkg, ZyppSel slb, - YStringTreeItem * rpmGroup ) -{ - ZyppPkg pkg = tryCastToZyppPkg (opkg); - if ( ! pkg || ! rpmGroup ) - return false; - - NCPkgTable * packageList = PackageList(); - - if ( !packageList ) - { - UIERR << "Widget is not a valid NCPkgTable widget" << endl; - return false; - } - - string group_str = _rpmGroupsTree->rpmGroup (rpmGroup); - // is the requested rpm group a prefix of this package's group? - if ( pkg->group ().find (group_str) == 0 ) - { - packageList->createListEntry( pkg, slb ); - - return true; - } - else - { - return false; - } -} - - // patches /////////////////////////////////////////////////////////////////// @@ -1607,6 +1453,7 @@ fillPatchPackages( patchPkgsVersions, packageList->getDataPointer( packageList->getCurrentItem() ), true ); } } + #if 0 else { // show the rich text widget @@ -1620,6 +1467,7 @@ packageList->showInformation( ); } } + #endif packageList->setKeyboardFocus(); @@ -2726,7 +2574,7 @@ YLayoutBox * menu_buttons = YUI::widgetFactory()->createHBox( left1); depsMenu = new NCPkgMenuDeps( menu_buttons, _("&Dependencies"), this); - viewMenu = new NCPkgMenuView( menu_buttons, _("&View")); + viewMenu = new NCPkgMenuView( menu_buttons, _("&View"), this); extrasMenu = new NCPkgMenuExtras( menu_buttons, _("&Extras"), this); YLayoutBox * hbox_top = YUI::widgetFactory()->createHBox( panels ); @@ -2784,7 +2632,7 @@ vSplit->setWeight(YD_HORIZ, 2); replacePoint = YUI::widgetFactory()->createReplacePoint( vSplit ); - infoText = new NCRichText( replacePoint, " " ); + infoText = new NCPkgPackageDetails( replacePoint, " ", this ); YUI_CHECK_NEW( infoText ); YAlignment *ll = YUI::widgetFactory()->createLeft( bottom_bar ); @@ -2847,9 +2695,11 @@ filterPopup->fillPackageList ( defaultGroup->value().translation(), defaultGroup ); // set the visible info to package description - setVisibleInfo ( pkginfoItem ); + //setVisibleInfo ( pkginfoItem ); + pkgList->setVisibleInfo(NCPkgTable::I_Descr); // show the package description of the current item pkgList->showInformation (); + //infoText->update( pkgList->getDataPointer(0), pkgList->getSelPointer(0), NCPkgTable::I_Descr ); } else { Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.h Tue Mar 4 09:40:03 2008 @@ -42,7 +42,9 @@ #include "NCPkgMenuView.h" #include "NCPkgMenuExtras.h" #include "NCPkgMenuHelp.h" +#include "NCPkgMenuView.h" #include "NCPkgMenuAction.h" +#include "NCPkgPackageDetails.h" #include "NCPkgPopupDeps.h" #include "NCPkgFilterMain.h" @@ -58,6 +60,8 @@ class NCPkgMenuExtras; class NCPkgMenuDeps; class NCPkgMenuAction; +class NCPkgMenuView; +class NCPkgPackageDetails; class NCPushButton; class YNCursesUI; class NCMenuButton; @@ -161,7 +165,7 @@ YLabel * diskspaceLabel; // information about packages - NCRichText * infoText; // short/longdecsription, filelist + NCPkgPackageDetails * infoText; // short/longdecsription, filelist YReplacePoint * replacePoint; // replace point for info text NCPkgTable * versionsList; // list of available package versions @@ -232,21 +236,13 @@ NCPkgPopupDeps *DepsPopup() { return depsPopup; } NCPkgPopupDiskspace *diskSpacePopup() { return diskspacePopup; } YLabel *PackageLabel() { return packageLabel; } + NCPkgPackageDetails *InfoText() { return infoText; } bool checkNow( bool *ok ) { return depsPopup->showDependencies( NCPkgPopupDeps::S_Solve, ok ); } bool verifySystem( bool *ok ) { return depsPopup->showDependencies( NCPkgPopupDeps::S_Verify, ok ); } - /** - * Fills the package table - * @param label The selected RPM group (the label) - * @param group The rpm group - * @return bool - */ - bool fillPackageList( const string & label, YStringTreeItem * group ); - - - /** + /** * Fills the package table with YOU patches matching the filter * @param filter * @return bool @@ -315,18 +311,8 @@ bool isAutoCheck() { return autoCheck; } void AutoCheck( bool check) { autoCheck = check; } - /** - * Gets default RPM group (the first group) - * @return YStringTreeItem * - */ - YStringTreeItem * getDefaultRpmGroup(); - /** - * @return the rpm groups - */ - const YRpmGroupsTree * rpmGroupsTree () const { return _rpmGroupsTree; } - - /** + /** * Handle the given event. For the given event (the widget-id * is contained in the event) the corresponding handler is executed. * @param event The NCurses event @@ -437,14 +423,7 @@ */ void updatePackageList(); - /** - * Check if 'pkg' matches 'selectedRpmGroup'. - * Returns true if there is a match, false otherwise or if 'pkg' is 0. - * @return bool - **/ - bool checkPackage( ZyppObj pkg, ZyppSel slb, YStringTreeItem * rpmGroup ); - - /** + /** * Check if 'patch' matches the selected filter. * Returns true if there is a match, false otherwise or if 'patch' is 0. * @return bool Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuView.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuView.cc Tue Mar 4 09:40:03 2008 @@ -23,8 +23,9 @@ Textdomain "packages" */ -NCPkgMenuView::NCPkgMenuView (YWidget *parent, string label) +NCPkgMenuView::NCPkgMenuView (YWidget *parent, string label, NCPackageSelector *pkger) : NCMenuButton( parent, label) + ,pkg (pkger) { createLayout(); } @@ -56,6 +57,42 @@ bool NCPkgMenuView::handleEvent ( const NCursesEvent & event) { - NCINT << "zatim nic" << endl; + if ( !event.selection) + return false; + + NCPkgTable *pkgList = pkg->PackageList(); + int idx = pkgList->getCurrentItem(); + + ZyppObj pkgPtr = pkgList->getDataPointer( idx ); + ZyppSel slbPtr = pkgList->getSelPointer( idx ); + + if ( !pkgPtr || !slbPtr) + { + NCERR << "*cobe*-d up" << endl; + return false; + } + + if (event.selection == description) + { + pkg->InfoText()->longDescription( pkgPtr ); + pkgList->setVisibleInfo (NCPkgTable::I_Descr); + } + else if (event.selection == technical ) + { + pkg->InfoText()->technicalData( pkgPtr, slbPtr ); + pkgList->setVisibleInfo (NCPkgTable::I_Technical); + } + else if (event.selection == files ) + { + pkg->InfoText()->fileList( slbPtr ); + pkgList->setVisibleInfo (NCPkgTable::I_Files); + } + else if (event.selection == deps ) + { + pkg->InfoText()->dependencyList( pkgPtr, slbPtr ); + pkgList->setVisibleInfo (NCPkgTable::I_Deps); + } + else + NCINT << "zatim nic" << endl; return true; } Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuView.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgMenuView.h Tue Mar 4 09:40:03 2008 @@ -23,12 +23,17 @@ #include "NCurses.h" #include "NCi18n.h" #include "NCMenuButton.h" +#include "NCPackageSelector.h" +#include "NCZypp.h" class NCPkgMenuView : public NCMenuButton { NCPkgMenuView & operator=( const NCPkgMenuView & ); NCPkgMenuView ( const NCPkgMenuView & ); +private: + NCPackageSelector *pkg; + public: YItemCollection items; @@ -39,7 +44,7 @@ YMenuItem *files; YMenuItem *deps; - NCPkgMenuView (YWidget *parent, string label); + NCPkgMenuView (YWidget *parent, string label, NCPackageSelector *pkger); virtual ~NCPkgMenuView(); void createLayout(); Added: branches/tmp/bubli/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgPackageDetails.cc (added) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgPackageDetails.cc Tue Mar 4 09:40:03 2008 @@ -0,0 +1,247 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: NCPkgPackageDetails.cc + +/-*/ + +#include "Y2Log.h" +#include "NCPkgTable.h" +#include "NCPkgPackageDetails.h" + + +NCPkgPackageDetails::NCPkgPackageDetails ( YWidget *parent, string initial_text, NCPackageSelector *pkger) + : NCRichText (parent, initial_text) + , pkg (pkger) +{ + +} + +string NCPkgPackageDetails::createRelLine( const zypp::CapSet & info ) +{ + string text = ""; + zypp::CapSet::const_iterator + b = info.begin (), + e = info.end (), + it; + unsigned int i, n = info.size(); + + for ( it = b, i = 0; it != e; ++it, ++i ) + { + text = text + (*it).asString(); + if ( i < n - 1 ) + { + text = text + ", "; + } + } + + return text; +} + +string NCPkgPackageDetails::createText( list<string> info, bool oneline ) +{ + list<string>::iterator it; + string text = ""; + unsigned int i; + + for ( i = 0, it = info.begin(); it != info.end() && i < 1000; ++it, i++ ) + { + text += (*it); + if ( i < info.size()-1 ) + { + if ( oneline && i < 999 ) + { + text += ", "; + } + else + { + text += " "; + } + } + if ( i == 999 ) + { + text += "..."; + } + } + + return text; +} + +void NCPkgPackageDetails::longDescription ( ZyppObj pkgPtr ) +{ + string text = ""; + + text += "<h3>" + pkgPtr->name() + " - "; + text += pkgPtr->summary() + "</h3>"; + + text += pkgPtr->description(); + + // show the description + setValue( text ); +} + +void NCPkgPackageDetails::technicalData( ZyppObj pkgPtr, ZyppSel slbPtr ) +{ + string instVersion = ""; + string version = ""; + string text = ""; + + text += slbPtr->name(); + //text += " - "; + + //text += pkgPtr->summary(); + text += " "; + + if ( slbPtr->hasBothObjects () ) + { + ZyppObj io = slbPtr->installedObj (); + instVersion = io->edition().version(); + instVersion += "-"; + instVersion += io->edition().release(); + ZyppObj co = slbPtr->candidateObj (); + version = co->edition().version(); + version += "-"; + version += co->edition().release(); + } + else + { + version = pkgPtr->edition().version(); + version += "-"; + version += pkgPtr->edition().release(); + } + + text += NCPkgNames::Version(); + text += version; + if ( instVersion != "" ) + { + text += " "; + text += NCPkgNames::InstVersion(); + text += instVersion; + } + text += " "; + + // show the size + text += NCPkgNames::Size(); + text += pkgPtr->size().asString(); + text += " "; + + ZyppPkg package = tryCastToZyppPkg (pkgPtr); + if ( package ) + { + // add the media nr + text += NCPkgNames::MediaNo(); + char num[5]; + int medianr = package->mediaNr (); + sprintf( num, "%d", medianr ); + text += num; + text += " "; + + // the license + text += NCPkgNames::License(); + text += package->license(); + text += " "; + text += " "; + + // the rpm group + text += NCPkgNames::RpmGroup(); + text += package->group (); + text += " "; + + //authors, in one line + text += NCPkgNames::Authors(); + list<string> authors = package->authors(); // zypp::Package + text += createText( authors, true ); + + } + + setValue (text); + +} + +void NCPkgPackageDetails::fileList( ZyppSel slbPtr ) +{ + string text = NCPkgNames::ListOfFiles(); + // the file list is available only for installed packages + ZyppPkg package = tryCastToZyppPkg (slbPtr->installedObj()); + + if ( package ) + { + // get the file list from the package manager/show the list + list<string> fileList = package->filenames(); + text += createText( fileList, false ) ; + } + + else + text = _("This information is available for installed packages only"); + + setValue(text); +} + +void NCPkgPackageDetails::dependencyList( ZyppObj pkgPtr, ZyppSel slbPtr ) +{ + string text = ""; + text += slbPtr->name(); + text += " - "; + + text += pkgPtr->summary(); // the summary + text += " "; + + // show the relations, all of them except provides which is above + zypp::Dep deptypes[] = { + zypp::Dep::PROVIDES, + zypp::Dep::PREREQUIRES, + zypp::Dep::REQUIRES, + zypp::Dep::CONFLICTS, + zypp::Dep::OBSOLETES, + zypp::Dep::RECOMMENDS, + zypp::Dep::SUGGESTS, + zypp::Dep::FRESHENS, + zypp::Dep::ENHANCES, + zypp::Dep::SUPPLEMENTS, + }; + for (size_t i = 0; i < sizeof (deptypes)/sizeof(deptypes[0]); ++i) + { + NCINT << "porn.bat" << endl; + zypp::Dep deptype = deptypes[i]; + zypp::CapSet relations = pkgPtr->dep (deptype); + string relline = createRelLine (relations); + if (!relline.empty ()) + { + // FIXME: translate + text += "" + deptype.asString () + ": " + + relline + " "; + } + } + + setValue (text); + +} +void NCPkgPackageDetails::update( ZyppObj pkgPtr, ZyppSel slbPtr, NCPkgTable::NCPkgTableInfoType mode ) +{ + switch (mode) + { + case NCPkgTable::I_Descr: + longDescription( pkgPtr ); + break; + case NCPkgTable::I_Technical: + technicalData( pkgPtr, slbPtr ); + break; + case NCPkgTable::I_Files: + fileList( slbPtr ); + break; + case NCPkgTable::I_Deps: + dependencyList( pkgPtr, slbPtr ); + break; + default: + break; + } +} Added: branches/tmp/bubli/ncurses-pkg/src/NCPkgPackageDetails.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgPackageDetails.h (added) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgPackageDetails.h Tue Mar 4 09:40:03 2008 @@ -0,0 +1,52 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: NCPkgPackageDetails.h + +/-*/ + +#ifndef NCPkgPackageDetails_h +#define NCPkgPackageDetails_h + +#include "NCRichText.h" +#include "NCPackageSelector.h" +#include "NCZypp.h" + +class NCPkgPackageDetails : public NCRichText { + + + NCPkgPackageDetails & operator=( const NCPkgPackageDetails & ); + NCPkgPackageDetails ( const NCPkgPackageDetails & ); + +private: + NCPackageSelector *pkg; + +public: + + NCPkgPackageDetails( YWidget *parent, string initial_text, NCPackageSelector * pkger ); + + string createText( list <string> info, bool oneline ); + + string createRelLine( const zypp::CapSet & info ); + + void longDescription( ZyppObj pkgPtr ); + + void technicalData( ZyppObj pkgPtr, ZyppSel slbPtr ); + + void fileList (ZyppSel slbPtr); + + void dependencyList( ZyppObj objPtr, ZyppSel slbPtr ); + + void update( ZyppObj pkgPtr, ZyppSel slbPtr, NCPkgTable::NCPkgTableInfoType mode ); + +}; +#endif Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgTable.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgTable.cc Tue Mar 4 09:40:03 2008 @@ -748,7 +748,8 @@ case T_Packages: case T_Update: // show the required package info - packager->showPackageInformation( objPtr, slbPtr ); + //packager->showPackageInformation( objPtr, slbPtr ); + packager->InfoText()->update( objPtr, slbPtr, VisibleInfo() ); packager->PackageLabel()->setLabel( slbPtr->name() ); break; case T_Patches: Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgTable.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgTable.h Tue Mar 4 09:40:03 2008 @@ -109,6 +109,14 @@ L_Installed, L_Unknown }; + + enum NCPkgTableInfoType { + I_Descr, + I_Technical, + I_Versions, + I_Files, + I_Deps, + }; private: @@ -125,6 +133,8 @@ // returns the first column of line with 'index' (the tag) NCPkgTableTag * getTag ( const int & index ); + NCPkgTableInfoType visibleInfo; + protected: @@ -310,7 +320,10 @@ */ bool showInformation ( ); + void setVisibleInfo( NCPkgTableInfoType info) { visibleInfo = info; } + NCPkgTableInfoType VisibleInfo() { return visibleInfo ; } + }; /////////////////////////////////////////////////////////////////// -- 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] r45173 - /branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.cc
by kmachalkova＠svn.opensuse.org 04 Mar '08

04 Mar '08

Author: kmachalkova Date: Tue Mar 4 09:38:07 2008 New Revision: 45173 URL: http://svn.opensuse.org/viewcvs/yast?rev=45173&view=rev Log: correct rpm tree :) Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.cc Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.cc Tue Mar 4 09:38:07 2008 @@ -106,7 +106,7 @@ } } - if ( pkg->rpmGroupsTree() ) + if (_rpmGroupsTree ) { // clone the tree (fill the NCTree) cloneTree( _rpmGroupsTree->root(), 0 ); -- 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] r45172 - /trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes
by jsuchome＠svn.opensuse.org 04 Mar '08

04 Mar '08

Author: jsuchome Date: Tue Mar 4 07:52:28 2008 New Revision: 45172 URL: http://svn.opensuse.org/viewcvs/yast?rev=45172&view=rev Log: changelog Modified: trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Modified: trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/package/yast2… ============================================================================== --- trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes (original) +++ trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Tue Mar 4 07:52:28 2008 @@ -2,8 +2,9 @@ Mon Mar 3 16:42:27 CET 2008 - jsuchome(a)suse.cz - added modalias to Supplements, so package could get selected - automatically on the systems with UPEK fingerprint reader (#361636) -- fixed handling of child process exit (#361638) + automatically on the systems with UPEK fingerprint reader + (bnc#361636) +- fixed handling of child process exit (bnc#361638) - 2.16.3 ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45171 - in /trunk/installation: ./ agents/ control/ control/docs/ control/docs/examples/ control/tests/ doc/ doc/autodocs/ doc/proposal/ package/ startup/ startup/First-Stage/ startup/Second-Stage...
by coolo＠svn.opensuse.org 03 Mar '08

03 Mar '08

Author: coolo Date: Mon Mar 3 21:14:06 2008 New Revision: 45171 URL: http://svn.opensuse.org/viewcvs/yast?rev=45171&view=rev Log: submit HEAD to autobuild to unpuzzle people not knowing how to use gdb Removed: trunk/installation/.cvsignore trunk/installation/agents/.cvsignore trunk/installation/control/.cvsignore trunk/installation/control/docs/.cvsignore trunk/installation/control/docs/examples/.cvsignore trunk/installation/control/tests/.cvsignore trunk/installation/doc/.cvsignore trunk/installation/doc/autodocs/.cvsignore trunk/installation/doc/proposal/.cvsignore trunk/installation/package/.cvsignore trunk/installation/startup/.cvsignore trunk/installation/startup/First-Stage/.cvsignore trunk/installation/startup/Second-Stage/.cvsignore trunk/installation/startup/arch/.cvsignore trunk/installation/startup/arch/ppc/.cvsignore trunk/installation/startup/arch/s390/.cvsignore trunk/installation/startup/arch/x86_64/.cvsignore trunk/installation/startup/common/.cvsignore trunk/installation/startup/hooks/.cvsignore trunk/installation/startup/hooks/postFirstCall/.cvsignore trunk/installation/startup/hooks/postFirstStage/.cvsignore trunk/installation/startup/hooks/postSecondCall/.cvsignore trunk/installation/startup/hooks/postSecondStage/.cvsignore trunk/installation/startup/hooks/preFirstCall/.cvsignore trunk/installation/startup/hooks/preFirstStage/.cvsignore trunk/installation/startup/hooks/preSecondCall/.cvsignore trunk/installation/startup/hooks/preSecondStage/.cvsignore trunk/installation/temporary/.cvsignore Modified: trunk/installation/package/yast2-installation.changes Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Mar 3 21:14:06 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Mar 3 21:12:25 CET 2008 - coolo(a)suse.de + +- trying to change defaults for running gdb (arvin's patch) + +------------------------------------------------------------------- Mon Mar 3 15:17:23 CET 2008 - locilka(a)suse.cz - Requiring the latest Language::Set functionality by RPM deps. -- 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] r45170 - in /branches/tmp/aschnell/part-redesign/storage/src: include/ep-main.ycp include/ep-nfs.ycp modules/FileSystems.ycp
by aschnell＠svn.opensuse.org 03 Mar '08

03 Mar '08

Author: aschnell Date: Mon Mar 3 18:26:19 2008 New Revision: 45170 URL: http://svn.opensuse.org/viewcvs/yast?rev=45170&view=rev Log: - added nfs tabs Added: branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/FileSystems.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Mon Mar 3 18:26:19 2008 @@ -45,6 +45,7 @@ include "partitioning/ep-hd.ycp"; include "partitioning/ep-lvm.ycp"; include "partitioning/ep-raid.ycp"; + include "partitioning/ep-nfs.ycp"; include "partitioning/ep-settings.ycp"; @@ -56,6 +57,7 @@ `hd : $[ `create : CreateHdPanel, `handle : HandleHdPanel ], `lvm : $[ `create : CreateLvmPanel, `handle : HandleLvmPanel ], `md : $[ `create : CreateRaidMainPanel, `handle : HandleRaidMainPanel ], + `nfs : $[ `create : CreateNfsMainPanel, `handle : HandleNfsMainPanel ], `settings : $[ `create : CreateSettingsPanel, `save : SaveSettingsPanel ] ]; map<symbol, list> subtree = $[]; @@ -108,7 +110,7 @@ huhu(disk, `dm, $[], nil); } else if (type == `CT_NFS) { - huhu(disk, `nfs, $[], nil); + huhu(disk, `nfs, $[ `create : CreateNfsOverviewPanel, `handle : HandleNfsOverviewPanel ], nil); } } @@ -173,6 +175,8 @@ any test_new_ep() { + SCR::Write(.target.ycp, Storage::SaveDumpPath("targetmap-ep-start"), Storage::GetTargetMap()); + Storage::CreateTargetBackup("expert-partitioner"); string back_label = Label::BackButton(); Added: branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp (added) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp Mon Mar 3 18:26:19 2008 @@ -0,0 +1,76 @@ +/** + * File: ep-nfs.ycp + * Package: yast2-storage + * Summary: Expert Partitioner + * Authors: Arvin Schnell <aschnell(a)suse.de> + * + */ +{ + textdomain "storage"; + + + void CreateNfsMainPanel(any user_data) + { + UI::ReplaceWidget(`tree_panel, + `VBox( + `HStretch(), + `Left(`Heading("Network File System (NFS)")), + `VBox( + `PushButton(`id(`create_nfs), "Create NFS Path...") + ), + `VStretch() + ) + ); + + Wizard::RestoreHelp("Help about NFS"); + } + + + void HandleNfsMainPanel(any user_data, any widget) + { + switch ((symbol) widget) + { + case `create_nfs: + break; + } + } + + + void CreateNfsOverviewPanel(any user_data) + { + string part_device = (string) user_data; + + map<string, map> target_map = Storage::GetTargetMap(); + + list<symbol> fields = StorageFields::Filter([ `mount_point, `size, `fs_type ]); + + UI::ReplaceWidget(`tree_panel, + `VBox( + `Left(`Heading("NFS Path: " + part_device)), + `HStretch(), + StorageFields::Overview(fields, target_map, part_device), + `VStretch(), + `HBox( + `PushButton(`id(`edit), "Edit..."), + `PushButton(`id(`delete), "Delete..."), + `HStretch() + ) + ) + ); + } + + + void HandleNfsOverviewPanel(any user_data, any widget) + { + string part_device = (string) user_data; + + switch ((symbol) widget) + { + case `edit: + break; + + case `delete: + break; + } + } +} Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/FileSystems.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/FileSystems.ycp Mon Mar 3 18:26:19 2008 @@ -1025,7 +1025,8 @@ global define string GetName( symbol used_fs, string defaultv )``{ map<symbol,any> fsmap = GetFsMap( used_fs); string ret = fsmap[`name]:""; - if ( ret == "" && used_fs == `ntfs ) ret = "NTFS"; + if ( ret == "" && used_fs == `ntfs ) ret = "NTFS"; // obsolete? (included in RealFileSystems) + if ( ret == "" && used_fs == `nfs ) ret = "NFS"; if ( ret == "" ) ret = defaultv; 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] r45169 - /trunk/installation/startup/YaST2.call
by aschnell＠svn.opensuse.org 03 Mar '08

03 Mar '08

Author: aschnell Date: Mon Mar 3 17:26:46 2008 New Revision: 45169 URL: http://svn.opensuse.org/viewcvs/yast?rev=45169&view=rev Log: - fixed gdb start condititon Modified: trunk/installation/startup/YaST2.call Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?… ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Mon Mar 3 17:26:46 2008 @@ -509,7 +509,7 @@ log "\tUI_ARGS: $Y2_UI_ARGS" log "\tQT_IM_MODULE: $QT_IM_MODULE" - if [ -z "$Y2GDB" ]; then + if [ "$Y2GDB" != "1" ]; then $OPT_FBITERM y2base \ "$Y2_MODULE_NAME" \ $Y2_MODE_FLAGS \ -- 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] r45168 - /tags/stable-2_16_3/fingerprint-reader/
by jsuchome＠svn.opensuse.org 03 Mar '08

03 Mar '08

Author: jsuchome Date: Mon Mar 3 16:55:19 2008 New Revision: 45168 URL: http://svn.opensuse.org/viewcvs/yast?rev=45168&view=rev Log: Created tag stable-2_16_3 for fingerprint-reader Added: tags/stable-2_16_3/fingerprint-reader/ - copied from r45167, trunk/fingerprint-reader/ -- 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] r45167 - in /trunk/fingerprint-reader: ./ agent-thinkfinger/src/ package/ src/
by jsuchome＠svn.opensuse.org 03 Mar '08

03 Mar '08

Author: jsuchome Date: Mon Mar 3 16:55:15 2008 New Revision: 45167 URL: http://svn.opensuse.org/viewcvs/yast?rev=45167&view=rev Log: - added modalias to Supplements, so package could get selected automatically on the systems with UPEK fingerprint reader (#361636) - fixed handling of child process exit (#361638) - 2.16.3 Modified: trunk/fingerprint-reader/VERSION trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.h trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp trunk/fingerprint-reader/yast2-fingerprint-reader.spec.in Modified: trunk/fingerprint-reader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/VERSION?rev=4… ============================================================================== --- trunk/fingerprint-reader/VERSION (original) +++ trunk/fingerprint-reader/VERSION Mon Mar 3 16:55:15 2008 @@ -1 +1 @@ -2.16.2 +2.16.3 Modified: trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-thinkfi… ============================================================================== --- trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc (original) +++ trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc Mon Mar 3 16:55:15 2008 @@ -38,6 +38,7 @@ ThinkFingerAgent::ThinkFingerAgent() : SCRAgent() { child_pid = -1; + child_retval = -1; } /** @@ -156,7 +157,7 @@ } else if (PC(0) == "state") { YCPMap retmap; - if (!child_pid) + if (child_pid == -1) { y2error ("ThinkFinger not initialized yet!"); return ret; @@ -178,19 +179,49 @@ } retmap->add (YCPString ("state"), YCPInteger (state)); } + else if (retval == 0) + { + // check if child is still alive + int status; + if (waitpid (-1, &status, WNOHANG) != 0) + { + if (WIFSIGNALED (status)) + { + y2error ("child process was killed"); + child_pid = -1; + return ret; + } + if (WIFEXITED (status)) + { + child_retval = WEXITSTATUS (status); + child_pid = -1; + return ret; + } + } + } return retmap; } // wait for child exit else if (PC(0) == "exit_status" ) { int status; int retval = 255; - wait (&status); - if (WIFSIGNALED (status)) - y2milestone ("child process was killed"); - else if (WIFEXITED (status)) + if (child_pid != -1) + { + wait (&status); + if (WIFSIGNALED (status)) + y2milestone ("child process was killed"); + else if (WIFEXITED (status)) + { + retval = WEXITSTATUS (status); + y2milestone ("retval is %d", retval); + } + } + else { - retval = WEXITSTATUS (status); - y2milestone ("retval is %d", retval); + y2milestone ("child process already dead"); + if (child_retval) + retval = child_retval; + child_retval = -1; } ret = YCPInteger (retval); close (data_pipe[0]); // close FD for reading @@ -237,6 +268,7 @@ { y2milestone ("... still alive, killing it", child_pid); kill (child_pid, 9); + wait (&status); } child_pid = -1; } Modified: trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-thinkfi… ============================================================================== --- trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.h (original) +++ trunk/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.h Mon Mar 3 16:55:15 2008 @@ -102,7 +102,6 @@ */ virtual YCPValue otherCommand(const YCPTerm& term); - /** * array with pipe file descriptors */ @@ -113,6 +112,11 @@ */ pid_t child_pid; + /** + * return value of the child process + */ + int child_retval; + }; #endif /* _ThinkFingerAgent_h */ Modified: trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/package/yast2… ============================================================================== --- trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes (original) +++ trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Mon Mar 3 16:55:15 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Mar 3 16:42:27 CET 2008 - jsuchome(a)suse.cz + +- added modalias to Supplements, so package could get selected + automatically on the systems with UPEK fingerprint reader (#361636) +- fixed handling of child process exit (#361638) +- 2.16.3 + +------------------------------------------------------------------- Mon Dec 10 16:21:43 CET 2007 - jsuchome(a)suse.cz - merged proofread texts Modified: trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/users_plu… ============================================================================== --- trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp (original) +++ trunk/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp Mon Mar 3 16:55:15 2008 @@ -170,7 +170,9 @@ if (ui == `cancel || ui == `back) { SCR::Execute (.thinkfinger.cancel); - y2milestone ("exit status after cancel: %1", SCR::Read (.thinkfinger.exit_status)); + // status label (canceled after user action) + UI::ReplaceWidget (`id (`rp), `Label (_("Canceled"))); + y2milestone ("canceled"); break; } sleep (100); Modified: trunk/fingerprint-reader/yast2-fingerprint-reader.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/yast2-fingerp… ============================================================================== --- trunk/fingerprint-reader/yast2-fingerprint-reader.spec.in (original) +++ trunk/fingerprint-reader/yast2-fingerprint-reader.spec.in Mon Mar 3 16:55:15 2008 @@ -5,6 +5,8 @@ BuildRequires: libthinkfinger libusb-devel BuildRequires: doxygen gcc-c++ yast2-core-devel perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-pam +Supplements: modalias(usb:v0483p2016d*dc*dsc*dp*ic*isc*ip*) + Conflicts: yast2-hardware-detection < 2.15.7 Summary: Configuration of fingerprint reader -- 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] r45166 - /tags/branch-SLE-10-SP2-2_13_3/fingerprint-reader/
by jsuchome＠svn.opensuse.org 03 Mar '08

03 Mar '08

Author: jsuchome Date: Mon Mar 3 16:44:55 2008 New Revision: 45166 URL: http://svn.opensuse.org/viewcvs/yast?rev=45166&view=rev Log: Created tag branch-SLE-10-SP2-2_13_3 for fingerprint-reader Added: tags/branch-SLE-10-SP2-2_13_3/fingerprint-reader/ - copied from r45165, branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/ -- 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] r45165 - in /branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader: ./ agent-thinkfinger/src/ package/ src/
by jsuchome＠svn.opensuse.org 03 Mar '08

03 Mar '08

Author: jsuchome Date: Mon Mar 3 16:44:47 2008 New Revision: 45165 URL: http://svn.opensuse.org/viewcvs/yast?rev=45165&view=rev Log: - fixed handling of child process exit (#361638) - 2.13.3 Modified: branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/VERSION branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.h branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/package/yast2-fingerprint-reader.changes branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/finger… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/VERSION Mon Mar 3 16:44:47 2008 @@ -1 +1 @@ -2.13.2 +2.13.3 Modified: branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/finger… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.cc Mon Mar 3 16:44:47 2008 @@ -38,6 +38,7 @@ ThinkFingerAgent::ThinkFingerAgent() : SCRAgent() { child_pid = -1; + child_retval = -1; } /** @@ -156,7 +157,7 @@ } else if (PC(0) == "state") { YCPMap retmap; - if (!child_pid) + if (child_pid == -1) { y2error ("ThinkFinger not initialized yet!"); return ret; @@ -178,19 +179,49 @@ } retmap->add (YCPString ("state"), YCPInteger (state)); } + else if (retval == 0) + { + // check if child is still alive + int status; + if (waitpid (-1, &status, WNOHANG) != 0) + { + if (WIFSIGNALED (status)) + { + y2error ("child process was killed"); + child_pid = -1; + return ret; + } + if (WIFEXITED (status)) + { + child_retval = WEXITSTATUS (status); + child_pid = -1; + return ret; + } + } + } return retmap; } // wait for child exit else if (PC(0) == "exit_status" ) { int status; int retval = 255; - wait (&status); - if (WIFSIGNALED (status)) - y2milestone ("child process was killed"); - else if (WIFEXITED (status)) + if (child_pid != -1) + { + wait (&status); + if (WIFSIGNALED (status)) + y2milestone ("child process was killed"); + else if (WIFEXITED (status)) + { + retval = WEXITSTATUS (status); + y2milestone ("retval is %d", retval); + } + } + else { - retval = WEXITSTATUS (status); - y2milestone ("retval is %d", retval); + y2milestone ("child process already dead"); + if (child_retval) + retval = child_retval; + child_retval = -1; } ret = YCPInteger (retval); close (data_pipe[0]); // close FD for reading @@ -237,6 +268,7 @@ { y2milestone ("... still alive, killing it", child_pid); kill (child_pid, 9); + wait (&status); } child_pid = -1; } Modified: branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/finger… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.h (original) +++ branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/agent-thinkfinger/src/ThinkFingerAgent.h Mon Mar 3 16:44:47 2008 @@ -102,7 +102,6 @@ */ virtual YCPValue otherCommand(const YCPTerm& term); - /** * array with pipe file descriptors */ @@ -113,6 +112,11 @@ */ pid_t child_pid; + /** + * return value of the child process + */ + int child_retval; + }; #endif /* _ThinkFingerAgent_h */ Modified: branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/package/yast2-fingerprint-reader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/finger… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/package/yast2-fingerprint-reader.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/package/yast2-fingerprint-reader.changes Mon Mar 3 16:44:47 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 29 13:08:29 CET 2008 - jsuchome(a)suse.cz + +- fixed handling of child process exit (#361638) +- 2.13.3 + +------------------------------------------------------------------- Thu Feb 14 10:09:42 CET 2008 - jsuchome(a)suse.cz - added modalias to Supplements, so package could get selected Modified: branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/finger… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/fingerprint-reader/src/users_plugin_fingerprint_reader.ycp Mon Mar 3 16:44:47 2008 @@ -170,7 +170,8 @@ if (ui == `cancel || ui == `back) { SCR::Execute (.thinkfinger.cancel); - y2milestone ("exit status after cancel: %1", SCR::Read (.thinkfinger.exit_status)); + y2milestone ("canceled"); +// y2milestone ("exit status after cancel: %1", SCR::Read (.thinkfinger.exit_status)); wait after cancel will be called in the cancel call break; } sleep (100); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0