[zypp-commit] r10793 - in /trunk: libzypp/zypp/Patch.cc libzypp/zypp/Patch.h libzypp/zypp/sat/SolvAttr.cc libzypp/zypp/sat/SolvAttr.h sat-solver/src/knownid.h sat-solver/tools/repo_updateinfoxml.c

Author: dmacvicar Date: Thu Aug 7 22:03:11 2008 New Revision: 10793 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10793&view=rev Log: implement relogin suggested Modified: trunk/libzypp/zypp/Patch.cc trunk/libzypp/zypp/Patch.h trunk/libzypp/zypp/sat/SolvAttr.cc trunk/libzypp/zypp/sat/SolvAttr.h trunk/sat-solver/src/knownid.h trunk/sat-solver/tools/repo_updateinfoxml.c Modified: trunk/libzypp/zypp/Patch.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Patch.cc?rev=10793&r1=10792&r2=10793&view=diff ============================================================================== --- trunk/libzypp/zypp/Patch.cc (original) +++ trunk/libzypp/zypp/Patch.cc Thu Aug 7 22:03:11 2008 @@ -80,6 +80,10 @@ bool Patch::restartSuggested() const { return lookupBoolAttribute( sat::SolvAttr::restartSuggested ); } + bool Patch::reloginSuggested() const + { return lookupBoolAttribute( sat::SolvAttr::reloginSuggested ); } + + bool Patch::interactive() const { if ( rebootSuggested() Modified: trunk/libzypp/zypp/Patch.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Patch.h?rev=10793&r1=10792&r2=10793&view=diff ============================================================================== --- trunk/libzypp/zypp/Patch.h (original) +++ trunk/libzypp/zypp/Patch.h Thu Aug 7 22:03:11 2008 @@ -82,6 +82,12 @@ bool restartSuggested() const; /** + * Does the patch needs the user to relogin to take effect? + * relogin is suggested then + */ + bool reloginSuggested() const; + + /** * \short Information or warning to be displayed to the user */ std::string message( const Locale & lang_r = Locale() ) const; Modified: trunk/libzypp/zypp/sat/SolvAttr.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.cc?rev=10793&r1=10792&r2=10793&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolvAttr.cc (original) +++ trunk/libzypp/zypp/sat/SolvAttr.cc Thu Aug 7 22:03:11 2008 @@ -74,6 +74,7 @@ const SolvAttr SolvAttr::patchcategory ( SOLVABLE_PATCHCATEGORY ); const SolvAttr SolvAttr::rebootSuggested ( UPDATE_REBOOT ); const SolvAttr SolvAttr::restartSuggested ( UPDATE_RESTART ); + const SolvAttr SolvAttr::reloginSuggested ( UPDATE_RELOGIN ); const SolvAttr SolvAttr::message ( UPDATE_MESSAGE ); const SolvAttr SolvAttr::updateCollectionName ( UPDATE_COLLECTION_NAME ); const SolvAttr SolvAttr::updateCollectionEvr ( UPDATE_COLLECTION_EVR ); Modified: trunk/libzypp/zypp/sat/SolvAttr.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.h?rev=10793&r1=10792&r2=10793&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolvAttr.h (original) +++ trunk/libzypp/zypp/sat/SolvAttr.h Thu Aug 7 22:03:11 2008 @@ -95,6 +95,7 @@ static const SolvAttr patchcategory; static const SolvAttr rebootSuggested; static const SolvAttr restartSuggested; + static const SolvAttr reloginSuggested; static const SolvAttr message; static const SolvAttr updateCollectionName; static const SolvAttr updateCollectionEvr; Modified: trunk/sat-solver/src/knownid.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/knownid.h?rev=10793&r1=10792&r2=10793&view=diff ============================================================================== --- trunk/sat-solver/src/knownid.h (original) +++ trunk/sat-solver/src/knownid.h Thu Aug 7 22:03:11 2008 @@ -127,6 +127,7 @@ KNOWNID(UPDATE_REBOOT, "update:reboot"), /* reboot suggested (kernel update) */ KNOWNID(UPDATE_RESTART, "update:restart"), /* restart suggested (update stack update) */ +KNOWNID(UPDATE_RELOGIN, "update:relogin"), /* restart suggested (update stack update) */ KNOWNID(UPDATE_MESSAGE, "update:message"), /* restart suggested (update stack update) */ /* 'content' of patch, usually list of packages */ Modified: trunk/sat-solver/tools/repo_updateinfoxml.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_updateinfoxml.c?rev=10793&r1=10792&r2=10793&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_updateinfoxml.c (original) +++ trunk/sat-solver/tools/repo_updateinfoxml.c Thu Aug 7 22:03:11 2008 @@ -64,6 +64,7 @@ STATE_FILENAME, /* 15 */ STATE_REBOOT, /* 16 */ STATE_RESTART, /* 17 */ + STATE_RELOGIN, /* 18 */ NUMSTATES }; @@ -95,6 +96,7 @@ { STATE_PACKAGE, "filename", STATE_FILENAME, 1 }, { STATE_PACKAGE, "reboot_suggested",STATE_REBOOT, 1 }, { STATE_PACKAGE, "restart_suggested",STATE_RESTART, 1 }, + { STATE_PACKAGE, "relogin_suggested",STATE_RELOGIN, 1 }, { NUMSTATES } }; @@ -439,6 +441,9 @@ /* True */ case STATE_RESTART: break; + /* True */ + case STATE_RELOGIN: + break; case NUMSTATES+1: split(NULL, NULL, 0); /* just to keep gcc happy about tools_util.h: static ... split() {...} Urgs!*/ break; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org