Author: dmacvicar Date: Mon Jun 2 17:48:05 2008 New Revision: 10316 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10316&view=rev Log: - add message tag in updateinfo to display messages in the user interface Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/package/libsatsolver.changes branches/SuSE-Linux-11_0-Branch/sat-solver/src/knownid.h branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_updateinfoxml.c Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/package/libsatsolver.changes?rev=10316&r1=10315&r2=10316&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/package/libsatsolver.changes (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/package/libsatsolver.changes Mon Jun 2 17:48:05 2008 @@ -7,6 +7,12 @@ - 0.9.0 ------------------------------------------------------------------- +Mon Jun 2 14:09:20 CEST 2008 - dmacvicar@suse.de + +- add message tag to updateinfo.xml for displaying + messages in the user interface + +------------------------------------------------------------------- Tue May 27 22:34:05 CEST 2008 - coolo@suse.de - compile with RPM_OPT_FLAGS Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/src/knownid.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/src/knownid.h?rev=10316&r1=10315&r2=10316&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/src/knownid.h (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/src/knownid.h Mon Jun 2 17:48:05 2008 @@ -120,6 +120,7 @@ KNOWNID(UPDATE_REBOOT, "update:reboot"), /* reboot suggested (kernel update) */ KNOWNID(UPDATE_RESTART, "update:restart"), /* restart suggested (update stack update) */ +KNOWNID(UPDATE_MESSAGE, "update:message"), /* restart suggested (update stack update) */ /* 'content' of patch, usually list of packages */ KNOWNID(UPDATE_COLLECTION, "update:collection"), /* "name evr arch" */ KNOWNID(UPDATE_COLLECTION_NAME, "update:collection:name"), /* name */ Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_updateinfoxml.c URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_updateinfoxml.c?rev=10316&r1=10315&r2=10316&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_updateinfoxml.c (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_updateinfoxml.c Mon Jun 2 17:48:05 2008 @@ -53,16 +53,17 @@ STATE_TITLE, /* 4 */ STATE_RELEASE, /* 5 */ STATE_ISSUED, /* 6 */ - STATE_REFERENCES, /* 7 */ - STATE_REFERENCE, /* 8 */ - STATE_DESCRIPTION, /* 9 */ - STATE_PKGLIST, /* 10 */ - STATE_COLLECTION, /* 11 */ - STATE_NAME, /* 12 */ - STATE_PACKAGE, /* 13 */ - STATE_FILENAME, /* 14 */ - STATE_REBOOT, /* 15 */ - STATE_RESTART, /* 16 */ + STATE_MESSAGE, /* 7 */ + STATE_REFERENCES, /* 8 */ + STATE_REFERENCE, /* 9 */ + STATE_DESCRIPTION, /* 10 */ + STATE_PKGLIST, /* 11 */ + STATE_COLLECTION, /* 12 */ + STATE_NAME, /* 13 */ + STATE_PACKAGE, /* 14 */ + STATE_FILENAME, /* 15 */ + STATE_REBOOT, /* 16 */ + STATE_RESTART, /* 17 */ NUMSTATES }; @@ -84,6 +85,7 @@ { STATE_UPDATE, "release", STATE_RELEASE, 1 }, { STATE_UPDATE, "issued", STATE_ISSUED, 1 }, { STATE_UPDATE, "description", STATE_DESCRIPTION, 1 }, + { STATE_UPDATE, "message", STATE_MESSAGE , 1 }, { STATE_UPDATE, "references", STATE_REFERENCES, 0 }, { STATE_UPDATE, "pkglist", STATE_PKGLIST, 0 }, { STATE_REFERENCES, "reference", STATE_REFERENCE, 0 }, @@ -348,6 +350,9 @@ /* <description>This update ...</description> */ case STATE_DESCRIPTION: break; + /* <message type="confirm">This update ...</message> */ + case STATE_MESSAGE: + break; case STATE_PKGLIST: break; /* <collection short="F8"> */ @@ -500,6 +505,14 @@ repodata_set_str(pd->data, pd->datanum, SOLVABLE_DESCRIPTION, pd->content); } break; + /* + * <message>Warning! ...</message> + */ + case STATE_MESSAGE: + { + repodata_set_str(pd->data, pd->datanum, UPDATE_MESSAGE, pd->content); + } + break; case STATE_PKGLIST: break; case STATE_COLLECTION: -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org