Author: mlschroe Date: Fri Jun 27 15:45:46 2008 New Revision: 10478 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10478&view=rev Log: - add support for the package's URL [bnc#402434] - unset CDPATH in repo2solv.sh [bnc#402597] Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/src/knownid.h branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo2solv.sh branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmdb.c branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmmd.c 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=10478&r1=10477&r2=10478&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 Fri Jun 27 15:45:46 2008 @@ -10,6 +10,12 @@ * */ + +/* + * Warning: you're free to append new entries, but insert/delete breaks + * the ABI! + */ + #undef KNOWNID #ifdef KNOWNID_INITIALIZE # define KNOWNID(a, b) b @@ -163,6 +169,8 @@ KNOWNID(DELTA_SEQ_EVR, "delta:seqevr"), KNOWNID(DELTA_SEQ_NUM, "delta:seqnum"), +KNOWNID(SOLVABLE_URL, "solvable:url"), + KNOWNID(ID_NUM_INTERNAL, 0) #ifdef KNOWNID_INITIALIZE Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo2solv.sh URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo2solv.sh?rev=10478&r1=10477&r2=10478&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo2solv.sh (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo2solv.sh Fri Jun 27 15:45:46 2008 @@ -21,6 +21,7 @@ set -e LANG=C +unset CDPATH parser_options=${PARSER_OPTIONS:-} Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmdb.c URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmdb.c?rev=10478&r1=10477&r2=10478&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmdb.c (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmdb.c Fri Jun 27 15:45:46 2008 @@ -30,7 +30,7 @@ #include "util.h" #include "repo_rpmdb.h" -#define RPMDB_COOKIE_VERSION 1 +#define RPMDB_COOKIE_VERSION 2 #define TAG_NAME 1000 #define TAG_VERSION 1001 @@ -44,6 +44,7 @@ #define TAG_VENDOR 1011 #define TAG_LICENSE 1014 #define TAG_GROUP 1016 +#define TAG_URL 1020 #define TAG_ARCH 1022 #define TAG_FILESIZES 1028 #define TAG_FILEMODES 1030 @@ -896,6 +897,9 @@ str = headstring(rpmhead, TAG_LICENSE); if (str) repodata_set_poolstr(repodata, handle, SOLVABLE_LICENSE, str); + str = headstring(rpmhead, TAG_URL); + if (str) + repodata_set_str(repodata, handle, SOLVABLE_URL, str); u32 = headint32(rpmhead, TAG_BUILDTIME); if (u32) repodata_set_num(repodata, handle, SOLVABLE_BUILDTIME, u32); Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmmd.c?rev=10478&r1=10477&r2=10478&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmmd.c (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmmd.c Fri Jun 27 15:45:46 2008 @@ -39,6 +39,7 @@ /* resobject attributes */ STATE_SUMMARY, STATE_DESCRIPTION, + STATE_URL, STATE_INSNOTIFY, STATE_DELNOTIFY, STATE_VENDOR, @@ -147,6 +148,7 @@ { STATE_SOLVABLE, "summary", STATE_SUMMARY, 1 }, { STATE_SOLVABLE, "description", STATE_DESCRIPTION, 1 }, + { STATE_SOLVABLE, "url", STATE_URL, 1 }, //{ STATE_SOLVABLE, "???", STATE_INSNOTIFY, 1 }, //{ STATE_SOLVABLE, "??", STATE_DELNOTIFY, 1 }, { STATE_SOLVABLE, "vendor", STATE_VENDOR, 1 }, @@ -833,6 +835,10 @@ pd->lang = 0; set_desciption_author(pd->data, handle, pd->content); break; + case STATE_URL: + if (pd->content[0]) + repodata_set_str(pd->data, handle, SOLVABLE_URL, pd->content); + break; case STATE_SOURCERPM: set_sourcerpm(pd->data, s, handle, pd->content); break; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org