June 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <sat-solver> master : - obtain default vendor the right way
by Michael Schroeder 24 Jun '09

24 Jun '09

ref: refs/heads/master commit 2aaad0394f75695c924e1774e5df92c1ece2bae7 Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 24 13:42:04 2009 +0200 - obtain default vendor the right way --- tools/susetags2solv.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/susetags2solv.c b/tools/susetags2solv.c index 753b86c..77da9c4 100644 --- a/tools/susetags2solv.c +++ b/tools/susetags2solv.c @@ -144,11 +144,8 @@ main(int argc, char **argv) perror(contentfile); exit(1); } - repo_add_content(repo, fp, REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE); - if (repo->start < repo->end) - if (!strncmp(id2str(pool, pool->solvables[repo->start].name), "product:", 8)) - defvendor = pool->solvables[repo->start].vendor; - fclose(fp); + repo_add_content(repo, fp, REPO_REUSE_REPODATA); + defvendor = repo_lookup_id(repo, SOLVID_META, SUSETAGS_DEFAULTVENDOR); } if (attrname) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : - add susetags:defaultvendor support
by Michael Schroeder 24 Jun '09

24 Jun '09

ref: refs/heads/master commit 33f2eb8e08d204980e5d686e9e7ee13d270265d2 Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 24 13:36:46 2009 +0200 - add susetags:defaultvendor support --- ext/repo_content.c | 32 +++++++++++++++++++++++++++----- src/knownid.h | 1 + 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/ext/repo_content.c b/ext/repo_content.c index 561e151..0cbdf2c 100644 --- a/ext/repo_content.c +++ b/ext/repo_content.c @@ -205,6 +205,7 @@ repo_add_content(Repo *repo, FILE *fp, int flags) int contentstyle = 0; char *descrdir = 0; char *datadir = 0; + char *defvendor = 0; int i = 0; @@ -272,14 +273,21 @@ repo_add_content(Repo *repo, FILE *fp, int flags) #define code10 (contentstyle == 10) #define code11 (contentstyle == 11) + if (istag ("CONTENTSTYLE")) { + if (contentstyle) + pool_debug(pool, SAT_ERROR, "repo_content: 'CONTENTSTYLE' must be first line of 'content'\n"); contentstyle = atoi(value); continue; } if (!contentstyle) contentstyle = 10; + /* repository tags */ + /* we also replicate some of them into the product solvables + * to be backward compatible */ + if (istag ("DESCRDIR")) { if (descrdir) @@ -302,6 +310,17 @@ repo_add_content(Repo *repo, FILE *fp, int flags) datadir = strdup(value); continue; } + if (istag ("VENDOR")) + { + if (defvendor) + free(defvendor); + else + repo_set_poolstr(repo, SOLVID_META, SUSETAGS_DEFAULTVENDOR, value); + if (s) + s->vendor = str2id(pool, value, 1); + defvendor = strdup(value); + continue; + } if (istag ("META") || istag ("HASH") || istag ("KEY")) { @@ -339,6 +358,8 @@ repo_add_content(Repo *repo, FILE *fp, int flags) continue; } + /* product tags */ + if ((code10 && istag ("PRODUCT")) || (code11 && istag ("NAME"))) { @@ -368,6 +389,8 @@ repo_add_content(Repo *repo, FILE *fp, int flags) repo_set_str(repo, s - pool->solvables, SUSETAGS_DATADIR, datadir); if (descrdir) repo_set_str(repo, s - pool->solvables, SUSETAGS_DESCRDIR, descrdir); + if (defvendor) + s->vendor = str2id(pool, defvendor, 1); continue; } @@ -402,7 +425,7 @@ repo_add_content(Repo *repo, FILE *fp, int flags) repo_set_str(repo, s - pool->solvables, pool_id2langid(pool, SOLVABLE_SUMMARY, key + 6, 1), value); else if (istag ("FLAGS")) add_multiple_strings(data, handle, PRODUCT_FLAGS, value); - else if (istag ("VENDOR")) + else if (istag ("VENDOR")) /* actually already handled above */ s->vendor = str2id(pool, value, 1); else if (istag ("BASEARCHS")) { @@ -424,10 +447,7 @@ repo_add_content(Repo *repo, FILE *fp, int flags) * */ - else if (code10 && istag ("CONTENTSTYLE")) - /* CONTENTSTYLE must be first line */ - pool_debug(pool, SAT_ERROR, "repo_content: 'CONTENTSTYLE' must be first line of 'content'\n"); - else if (code10 && istag ("DISTPRODUCT")) + if (code10 && istag ("DISTPRODUCT")) /* DISTPRODUCT is for registration and Yast, not for the solver. */ repo_set_str(repo, s - pool->solvables, PRODUCT_DISTPRODUCT, value); else if (code10 && istag ("DISTVERSION")) @@ -473,6 +493,8 @@ repo_add_content(Repo *repo, FILE *fp, int flags) free(datadir); if (descrdir) free(descrdir); + if (defvendor) + free(defvendor); if (!s || !s->name) { diff --git a/src/knownid.h b/src/knownid.h index 0dd42be..38e37ff 100644 --- a/src/knownid.h +++ b/src/knownid.h @@ -173,6 +173,7 @@ KNOWNID(PRODUCT_REGISTER_RELEASE, "product:regrelease"), /* argh */ KNOWNID(SUSETAGS_DATADIR, "susetags:datadir"), KNOWNID(SUSETAGS_DESCRDIR, "susetags:descrdir"), +KNOWNID(SUSETAGS_DEFAULTVENDOR, "susetags:defaultvendor"), KNOWNID(SUSETAGS_FILE, "susetags:file"), KNOWNID(SUSETAGS_FILE_NAME, "susetags:file:name"), KNOWNID(SUSETAGS_FILE_TYPE, "susetags:file:type"), -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : - change the interface of repo_add_susetags: take default vendor id,
by Michael Schroeder 24 Jun '09

24 Jun '09

ref: refs/heads/master commit 19f89b3df269a0cd79b0fa8605580f64ff9c7fab Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 24 12:41:06 2009 +0200 - change the interface of repo_add_susetags: take default vendor id, not product solvable id --- ext/repo_susetags.c | 13 +++---------- ext/repo_susetags.h | 2 +- tools/susetags2solv.c | 18 ++++++++++-------- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/ext/repo_susetags.c b/ext/repo_susetags.c index 66880fc..10500e7 100644 --- a/ext/repo_susetags.c +++ b/ext/repo_susetags.c @@ -399,13 +399,13 @@ finish_solvable(struct parsedata *pd, Solvable *s, Id handle, Offset freshens) * parse susetags * * fp: file to read from - * product: solvable representing the product (0 if none) + * defvendor: default vendor (0 if none) * language: current language (0 if none) * flags: flags */ void -repo_add_susetags(Repo *repo, FILE *fp, Id product, const char *language, int flags) +repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int flags) { Pool *pool = repo->pool; char *line, *linep; @@ -420,7 +420,6 @@ repo_add_susetags(Repo *repo, FILE *fp, Id product, const char *language, int fl struct parsedata pd; Repodata *data = 0; Id handle = 0; - Id vendor = 0; if ((flags & SUSETAGS_EXTEND) && repo->nrepodata) indesc = 1; @@ -430,12 +429,6 @@ repo_add_susetags(Repo *repo, FILE *fp, Id product, const char *language, int fl else data = repo_last_repodata(repo); - if (product) - { - if (!strncmp(id2str(pool, pool->solvables[product].name), "product:", 8)) - vendor = pool->solvables[product].vendor; - } - memset(&pd, 0, sizeof(pd)); line = malloc(1024); aline = 1024; @@ -657,7 +650,7 @@ repo_add_susetags(Repo *repo, FILE *fp, Id product, const char *language, int fl s->arch = arch; else s->arch = str2id(pool, sp[3], 1); - s->vendor = vendor; /* default to product vendor */ + s->vendor = defvendor; } } diff --git a/ext/repo_susetags.h b/ext/repo_susetags.h index a617c65..57acaeb 100644 --- a/ext/repo_susetags.h +++ b/ext/repo_susetags.h @@ -12,4 +12,4 @@ #define SUSETAGS_KINDS_SEPARATELY (1 << 2) #define SUSETAGS_EXTEND (1 << 3) -extern void repo_add_susetags(Repo *repo, FILE *fp, Id product, const char *language, int flags); +extern void repo_add_susetags(Repo *repo, FILE *fp, Id defvendor, const char *language, int flags); diff --git a/tools/susetags2solv.c b/tools/susetags2solv.c index 8393ba6..753b86c 100644 --- a/tools/susetags2solv.c +++ b/tools/susetags2solv.c @@ -97,7 +97,7 @@ main(int argc, char **argv) const char *descrdir = 0; const char *basefile = 0; const char *query = 0; - Id product = 0; + Id defvendor = 0; int flags = 0; int c; @@ -145,8 +145,10 @@ main(int argc, char **argv) exit(1); } repo_add_content(repo, fp, REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE); - product = repo->start; - fclose (fp); + if (repo->start < repo->end) + if (!strncmp(id2str(pool, pool->solvables[repo->start].name), "product:", 8)) + defvendor = pool->solvables[repo->start].vendor; + fclose(fp); } if (attrname) @@ -213,7 +215,7 @@ main(int argc, char **argv) perror(fn); exit(1); } - repo_add_susetags(repo, fp, product, 0, flags | REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE); + repo_add_susetags(repo, fp, defvendor, 0, flags | REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE); fclose(fp); } else if (!strcmp(fn, "packages.DU") || !strcmp(fn, "packages.DU.gz")) @@ -225,7 +227,7 @@ main(int argc, char **argv) perror(fn); exit(1); } - repo_add_susetags(repo, fp, product, 0, flags | SUSETAGS_EXTEND | REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE); + repo_add_susetags(repo, fp, defvendor, 0, flags | SUSETAGS_EXTEND | REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE); fclose(fp); } else if (!strcmp(fn, "packages.FL") || !strcmp(fn, "packages.FL.gz")) @@ -238,7 +240,7 @@ main(int argc, char **argv) perror(fn); exit(1); } - repo_add_susetags(repo, fp, product, 0, flags | SUSETAGS_EXTEND | REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE); + repo_add_susetags(repo, fp, defvendor, 0, flags | SUSETAGS_EXTEND | REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE); fclose(fp); #else /* ignore for now. reactivate when filters work */ @@ -266,7 +268,7 @@ main(int argc, char **argv) perror(fn); exit(1); } - repo_add_susetags(repo, fp, product, lang, flags | SUSETAGS_EXTEND | REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE); + repo_add_susetags(repo, fp, defvendor, lang, flags | SUSETAGS_EXTEND | REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE); fclose(fp); } } @@ -278,7 +280,7 @@ main(int argc, char **argv) } else /* read data from stdin */ - repo_add_susetags(repo, stdin, product, 0, REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE); + repo_add_susetags(repo, stdin, defvendor, 0, REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE); repo_internalize(repo); if (query) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> SuSE-SLE-10-SP3-Branch : changes 2.100.2
by Michael Andres 24 Jun '09

24 Jun '09

ref: refs/heads/SuSE-SLE-10-SP3-Branch commit ee1f1b4e656fc9a36194faa7e767f5dea82a9a6a Author: Michael Andres <ma(a)suse.de> Date: Wed Jun 24 12:27:18 2009 +0200 changes 2.100.2 --- VERSION | 2 +- package/libzypp.changes | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/VERSION b/VERSION index 716ad09..3817d0f 100644 --- a/VERSION +++ b/VERSION @@ -49,5 +49,5 @@ dnl ================================================== m4_define([LIBZYPP_MINOR], [100]) m4_define([LIBZYPP_COMPATMINOR], [15]) dnl ================================================== -m4_define([LIBZYPP_PATCH], [1]) +m4_define([LIBZYPP_PATCH], [2]) dnl ================================================== diff --git a/package/libzypp.changes b/package/libzypp.changes index cdd0e56..4ee2a15 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 24 12:15:26 CEST 2009 - ma(a)suse.de + +- Support hexencoded modalias strings (bnc #456695, bnc #515858) +- version 2.100.2 + +------------------------------------------------------------------- Fri Jun 5 16:11:06 CEST 2009 - ma(a)suse.de - Don't reject modalias dependencies with "op edition" part. (bnc #505627) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> SuSE-SLE-10-SP3-Branch : Support hexencoded modalias strings (bnc #456695, bnc #515858)
by Michael Andres 24 Jun '09

24 Jun '09

ref: refs/heads/SuSE-SLE-10-SP3-Branch commit b114a8eaa2f7e5adb7b9c6cb20414f0a685d1c0f Author: Michael Andres <ma(a)suse.de> Date: Wed Jun 24 12:27:02 2009 +0200 Support hexencoded modalias strings (bnc #456695, bnc #515858) --- zypp/base/String.cc | 86 ++++++++++++++++++++++++++++++++++++--- zypp/base/String.h | 16 +++++++- zypp/capability/ModaliasCap.cc | 3 +- 3 files changed, 96 insertions(+), 9 deletions(-) diff --git a/zypp/base/String.cc b/zypp/base/String.cc index 6a2d85a..9a3a29d 100644 --- a/zypp/base/String.cc +++ b/zypp/base/String.cc @@ -80,7 +80,79 @@ namespace zypp ); } - /****************************************************************** + /////////////////////////////////////////////////////////////////// + // Hexencode + /////////////////////////////////////////////////////////////////// + namespace { + /** What's not decoded. */ + inline bool heIsAlNum( char ch ) + { + return ( ( 'a' <= ch && ch <= 'z' ) + ||( 'A' <= ch && ch <= 'Z' ) + ||( '0' <= ch && ch <= '9' ) ); + } + /** Hex-digit to number or -1. */ + inline int heDecodeCh( char ch ) + { + if ( '0' <= ch && ch <= '9' ) + return( ch - '0' ); + if ( 'A' <= ch && ch <= 'F' ) + return( ch - 'A' + 10 ); + if ( 'a' <= ch && ch <= 'f' ) + return( ch - 'A' + 10 ); + return -1; + } + } + + std::string hexencode( const std::string & str_r ) + { + static const char *const hdig = "0123456789ABCDEF"; + std::string res; + res.reserve( str_r.size() ); + for ( const char * it = str_r.c_str(); *it; ++it ) + { + if ( heIsAlNum( *it ) ) + { + res += *it; + } + else + { + res += '%'; + res += hdig[(unsigned char)(*it)/16]; + res += hdig[(unsigned char)(*it)%16]; + } + } + return res; + } + + std::string hexdecode( const std::string & str_r ) + { + std::string res; + res.reserve( str_r.size() ); + for ( const char * it = str_r.c_str(); *it; ++it ) + { + if ( *it == '%' ) + { + int d1 = heDecodeCh( *(it+1) ); + if ( d1 != -1 ) + { + int d2 = heDecodeCh( *(it+2) ); + if ( d2 != -1 ) + { + res += (d1<<4)|d2; + it += 2; + continue; + } + } + } + // verbatim if no %XX: + res += *it; + } + return res; + } + /////////////////////////////////////////////////////////////////// + + /****************************************************************** ** ** FUNCTION NAME : toLower ** FUNCTION TYPE : std::string @@ -161,13 +233,13 @@ namespace zypp { if ( ltrim_first ) line = ltrim( line ); - + if ( line.empty() ) return line; - + std::string ret; std::string::size_type p = line.find_first_of( " \t" ); - + if ( p == std::string::npos ) { // no ws on line ret = line; @@ -204,15 +276,15 @@ namespace zypp str.getline( tmpBuff, tmpBuffLen ); // always writes '\0' terminated ret += tmpBuff; } while( str.rdstate() == std::ios::failbit ); - + return trim( ret, trim_r ); } - + std::string getline( std::istream & str, const Trim trim_r ) { return _getline(str, trim_r); } - + std::string getline( std::istream & str, bool trim ) { return _getline(str, trim?TRIM:NO_TRIM); diff --git a/zypp/base/String.h b/zypp/base/String.h index 6f0c672..b8f50a5 100644 --- a/zypp/base/String.h +++ b/zypp/base/String.h @@ -207,7 +207,7 @@ namespace zypp /////////////////////////////////////////////////////////////////// /** Parsing boolean from string. - */ + */ //@{ /** Return \c true if str is <tt>1, true, yes, on</tt>. */ bool strToTrue( const std::string & str ); @@ -354,6 +354,20 @@ namespace zypp { return join( cont_r.begin(), cont_r.end(), sep_r ); } //@} + /////////////////////////////////////////////////////////////////// + /** \name Hexencode. + * Encode all characters other than [a-zA-Z0-9] as %XX. + * This includes the % character itself, which becomes %25. + */ + //@{ + /** Encode all characters other than [a-zA-Z0-9] as %XX. + * This includes the % character itself, which becomes %25. + */ + std::string hexencode( const std::string & str_r ); + /** Decode hexencoded %XX sequences. */ + std::string hexdecode( const std::string & str_r ); + //@} + /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// /** \name Case conversion. */ diff --git a/zypp/capability/ModaliasCap.cc b/zypp/capability/ModaliasCap.cc index 8e76e63..754c6b7 100644 --- a/zypp/capability/ModaliasCap.cc +++ b/zypp/capability/ModaliasCap.cc @@ -11,6 +11,7 @@ */ #include <iostream> #include "zypp/base/Logger.h" +#include "zypp/base/String.h" #include "zypp/capability/ModaliasCap.h" #include "zypp/target/modalias/Modalias.h" @@ -113,7 +114,7 @@ namespace zypp bool ModaliasCap::evaluate() const { - return target::modalias::Modalias::instance().query( _name, _op, _value ); + return target::modalias::Modalias::instance().query( str::hexdecode(_name), _op, _value ); } ///////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> SuSE-SLE-10-SP3-Branch : Update gitignore
by Michael Andres 24 Jun '09

24 Jun '09

ref: refs/heads/SuSE-SLE-10-SP3-Branch commit 8ed461b83ad9a99153f9c5272f3740802e39350d Author: Michael Andres <ma(a)suse.de> Date: Wed Jun 24 12:26:32 2009 +0200 Update gitignore --- .gitignore | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 67587bf..c1e75fb 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ Makefile *.lo *.a *.la +*.gmo +*~ aclocal.m4 autom4te.cache/ config.guess @@ -27,3 +29,5 @@ libzypp.spec devel/genclass doc/autodoc/Doxyfile po/POTFILES +po/zypp.pot +package/zypp-*.tar.bz2 -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : - convert META/HASH/KEY data from content file
by Michael Schroeder 24 Jun '09

24 Jun '09

ref: refs/heads/master commit 3fd3653b62c8832aff1e237b03c14dbb2af2ca16 Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 24 12:24:58 2009 +0200 - convert META/HASH/KEY data from content file --- ext/repo_content.c | 42 +++++++++++++++++++++++++++++++++++------- src/knownid.h | 4 ++++ 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/ext/repo_content.c b/ext/repo_content.c index b398297..561e151 100644 --- a/ext/repo_content.c +++ b/ext/repo_content.c @@ -303,13 +303,41 @@ repo_add_content(Repo *repo, FILE *fp, int flags) continue; } - /* XXX: add those to SOLVID_META, too */ - if (istag ("META")) - continue; - if (istag ("HASH")) - continue; - if (istag ("KEY")) - continue; + if (istag ("META") || istag ("HASH") || istag ("KEY")) + { + char *checksumtype, *checksum; + Id fh, type; + int l; + + if ((checksumtype = splitword(&value)) == 0) + continue; + if ((checksum = splitword(&value)) == 0) + continue; + if (!*value) + continue; + if (!strcasecmp(checksumtype, "sha") || !strcasecmp(checksumtype, "sha1")) + l = SIZEOF_SHA1 * 2, type = REPOKEY_TYPE_SHA1; + else if (!strcasecmp(checksumtype, "sha256")) + l = SIZEOF_SHA256 * 2, type = REPOKEY_TYPE_SHA256; + else if (!strcasecmp(checksumtype, "md5")) + l = SIZEOF_MD5 * 2, type = REPOKEY_TYPE_MD5; + else + { + fprintf(stderr, "Unknown checksum type: %s: %s\n", value, checksumtype); + exit(1); + } + if (strlen(checksum) != l) + { + fprintf(stderr, "Invalid checksum length: %s: for %s\n", value, checksum); + exit(1); + } + fh = repodata_new_handle(data); + repodata_set_poolstr(data, fh, SUSETAGS_FILE_TYPE, key); + repodata_set_str(data, fh, SUSETAGS_FILE_NAME, value); + repodata_set_checksum(data, fh, SUSETAGS_FILE_CHECKSUM, type, checksum); + repodata_add_flexarray(data, SOLVID_META, SUSETAGS_FILE, fh); + continue; + } if ((code10 && istag ("PRODUCT")) || (code11 && istag ("NAME"))) diff --git a/src/knownid.h b/src/knownid.h index 62be3ce..0dd42be 100644 --- a/src/knownid.h +++ b/src/knownid.h @@ -173,6 +173,10 @@ KNOWNID(PRODUCT_REGISTER_RELEASE, "product:regrelease"), /* argh */ KNOWNID(SUSETAGS_DATADIR, "susetags:datadir"), KNOWNID(SUSETAGS_DESCRDIR, "susetags:descrdir"), +KNOWNID(SUSETAGS_FILE, "susetags:file"), +KNOWNID(SUSETAGS_FILE_NAME, "susetags:file:name"), +KNOWNID(SUSETAGS_FILE_TYPE, "susetags:file:type"), +KNOWNID(SUSETAGS_FILE_CHECKSUM, "susetags:file:checksum"), /* timestamp then the repository was generated */ KNOWNID(REPOSITORY_TIMESTAMP, "repository:timestamp"), -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : - fix typo: "desc" -> "descr". Seems to make no difference, though
by Michael Schroeder 24 Jun '09

24 Jun '09

ref: refs/heads/master commit e4d123decd6e9ec3d9c242145da56b2d51330980 Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 24 11:28:27 2009 +0200 - fix typo: "desc" -> "descr". Seems to make no difference, though --- tools/repo2solv.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/repo2solv.sh b/tools/repo2solv.sh index 82cf382..288acf2 100755 --- a/tools/repo2solv.sh +++ b/tools/repo2solv.sh @@ -7,7 +7,7 @@ get_DESCRDIR () { local d=$(grep '^DESCRDIR' content | sed 's/^DESCRDIR[[:space:]]\+$.*[^[:space:]]$[[:space:]]*$/\1/') if test -z "$d"; then - echo suse/setup/desc + echo suse/setup/descr else echo ${d} fi -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : - repo_content: store DESCRDIR
by Michael Schroeder 24 Jun '09

24 Jun '09

ref: refs/heads/master commit 5a479c355bf11fa3e0ed482e29ef943c1a2a4760 Author: Michael Schroeder <mls(a)suse.de> Date: Wed Jun 24 11:26:18 2009 +0200 - repo_content: store DESCRDIR - susetags2solv: add query option --- ext/repo_content.c | 58 ++++++++++++++++++++++++++++++++++++++++-------- src/knownid.h | 9 +++++-- tools/susetags2solv.c | 29 ++++++++++++++++++++++- 3 files changed, 81 insertions(+), 15 deletions(-) diff --git a/ext/repo_content.c b/ext/repo_content.c index 4c71c42..b398297 100644 --- a/ext/repo_content.c +++ b/ext/repo_content.c @@ -203,6 +203,8 @@ repo_add_content(Repo *repo, FILE *fp, int flags) Repodata *data; Id handle = 0; int contentstyle = 0; + char *descrdir = 0; + char *datadir = 0; int i = 0; @@ -270,17 +272,45 @@ repo_add_content(Repo *repo, FILE *fp, int flags) #define code10 (contentstyle == 10) #define code11 (contentstyle == 11) - if (contentstyle == 0) + if (istag ("CONTENTSTYLE")) { - if (istag ("CONTENTSTYLE")) - { - contentstyle = atoi(value); - continue; - } + contentstyle = atoi(value); + continue; + } + if (!contentstyle) + contentstyle = 10; + + if (istag ("DESCRDIR")) + { + if (descrdir) + free(descrdir); + else + repo_set_str(repo, SOLVID_META, SUSETAGS_DESCRDIR, value); + if (s) + repo_set_str(repo, s - pool->solvables, SUSETAGS_DESCRDIR, value); + descrdir = strdup(value); + continue; + } + if (istag ("DATADIR")) + { + if (datadir) + free(datadir); else - contentstyle = 10; + repo_set_str(repo, SOLVID_META, SUSETAGS_DATADIR, value); + if (s) + repo_set_str(repo, s - pool->solvables, SUSETAGS_DATADIR, value); + datadir = strdup(value); + continue; } + /* XXX: add those to SOLVID_META, too */ + if (istag ("META")) + continue; + if (istag ("HASH")) + continue; + if (istag ("KEY")) + continue; + if ((code10 && istag ("PRODUCT")) || (code11 && istag ("NAME"))) { @@ -306,6 +336,10 @@ repo_add_content(Repo *repo, FILE *fp, int flags) repodata_extend(data, s - pool->solvables); handle = s - pool->solvables; s->name = str2id(pool, join(&pd, "product", ":", value), 1); + if (datadir) + repo_set_str(repo, s - pool->solvables, SUSETAGS_DATADIR, datadir); + if (descrdir) + repo_set_str(repo, s - pool->solvables, SUSETAGS_DESCRDIR, descrdir); continue; } @@ -324,8 +358,6 @@ repo_add_content(Repo *repo, FILE *fp, int flags) pd.tmprel = strdup(value); else if (code11 && istag ("DISTRIBUTION")) repo_set_str(repo, s - pool->solvables, SOLVABLE_DISTRIBUTION, value); - else if (istag ("DATADIR")) - repo_set_str(repo, s - pool->solvables, SUSETAGS_DATADIR, value); else if (istag ("UPDATEURLS")) add_multiple_urls(data, handle, value, str2id(pool, "update", 1)); else if (istag ("EXTRAURLS")) @@ -409,9 +441,14 @@ repo_add_content(Repo *repo, FILE *fp, int flags) pool_debug(pool, SAT_ERROR, "repo_content: malformed line: %s\n", line); } + if (datadir) + free(datadir); + if (descrdir) + free(descrdir); + if (!s || !s->name) { - pool_debug(pool, SAT_FATAL, "repo_content: 'content' incomplete, no product solvable created !\n"); + pool_debug(pool, SAT_FATAL, "repo_content: 'content' incomplete, no product solvable created!\n"); exit(1); } @@ -460,6 +497,7 @@ repo_add_content(Repo *repo, FILE *fp, int flags) sat_free(pd.tmp); sat_free(line); sat_free(otherarchs); + join_freemem(); if (!(flags & REPO_NO_INTERNALIZE)) repodata_internalize(data); } diff --git a/src/knownid.h b/src/knownid.h index 723af5d..62be3ce 100644 --- a/src/knownid.h +++ b/src/knownid.h @@ -139,10 +139,11 @@ KNOWNID(SOLVABLE_ORDER, "solvable:order"), 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_RELOGIN, "update:relogin"), /* relogin suggested */ -KNOWNID(UPDATE_MESSAGE, "update:message"), /* restart suggested (update stack update) */ - /* 'content' of patch, usually list of packages */ +KNOWNID(UPDATE_MESSAGE, "update:message"), /* informative message */ + +/* 'content' of patch, usually list of packages */ KNOWNID(UPDATE_COLLECTION, "update:collection"), /* "name evr arch" */ KNOWNID(UPDATE_COLLECTION_NAME, "update:collection:name"), /* name */ KNOWNID(UPDATE_COLLECTION_EVR, "update:collection:evr"), /* epoch:version-release */ @@ -171,6 +172,7 @@ KNOWNID(PRODUCT_REGISTER_RELEASE, "product:regrelease"), /* argh */ KNOWNID(SUSETAGS_DATADIR, "susetags:datadir"), +KNOWNID(SUSETAGS_DESCRDIR, "susetags:descrdir"), /* timestamp then the repository was generated */ KNOWNID(REPOSITORY_TIMESTAMP, "repository:timestamp"), @@ -207,6 +209,7 @@ KNOWNID(DELTA_SEQ_NAME, "delta:seqname"), KNOWNID(DELTA_SEQ_EVR, "delta:seqevr"), KNOWNID(DELTA_SEQ_NUM, "delta:seqnum"), +/* XXX: shouldn't use a real ID */ KNOWNID(NAMESPACE_PRODUCTBUDDY, "namespace:productbuddy"), KNOWNID(REPOSITORY_REPOMD, "repository:repomd"), diff --git a/tools/susetags2solv.c b/tools/susetags2solv.c index 9a0325b..8393ba6 100644 --- a/tools/susetags2solv.c +++ b/tools/susetags2solv.c @@ -72,6 +72,23 @@ myfopen(const char *fn) return fopencookie(gzf, "r", cio); } +/* content file query */ +static void +doquery(Pool *pool, Repo *repo, const char *arg) +{ + char qbuf[256]; + const char *str; + Id id; + + snprintf(qbuf, sizeof(qbuf), "susetags:%s", arg); + id = str2id(pool, qbuf, 0); + if (!id) + return; + str = repo_lookup_str(repo, SOLVID_META, id); + if (str) + printf("%s\n", str); +} + int main(int argc, char **argv) { @@ -79,11 +96,12 @@ main(int argc, char **argv) const char *attrname = 0; const char *descrdir = 0; const char *basefile = 0; + const char *query = 0; Id product = 0; int flags = 0; int c; - while ((c = getopt(argc, argv, "hkn:c:d:b:")) >= 0) + while ((c = getopt(argc, argv, "hkn:c:d:b:q:")) >= 0) { switch (c) { @@ -105,6 +123,9 @@ main(int argc, char **argv) case 'b': basefile = optarg; break; + case 'q': + query = optarg; + break; default: usage(1); break; @@ -259,7 +280,11 @@ main(int argc, char **argv) /* read data from stdin */ repo_add_susetags(repo, stdin, product, 0, REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE); repo_internalize(repo); - tool_write(repo, basefile, attrname); + + if (query) + doquery(pool, repo, query); + else + tool_write(repo, basefile, attrname); pool_free(pool); exit(0); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : - add query mode
by Michael Schroeder 23 Jun '09

23 Jun '09

ref: refs/heads/master commit 07c8c8c0c8294455a1edd704e3eca09dafd99421 Author: Michael Schroeder <mls(a)suse.de> Date: Tue Jun 23 19:14:55 2009 +0200 - add query mode --- tools/repomdxml2solv.c | 103 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 82 insertions(+), 21 deletions(-) diff --git a/tools/repomdxml2solv.c b/tools/repomdxml2solv.c index a4bc097..2dcdb7e 100644 --- a/tools/repomdxml2solv.c +++ b/tools/repomdxml2solv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Novell Inc. + * Copyright (c) 2007-2009, Novell Inc. * * This program is licensed under the BSD license, read LICENSE.BSD * for further information @@ -11,6 +11,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include "pool.h" #include "repo.h" @@ -18,43 +19,103 @@ #include "common_write.h" static void -usage(const char *err) +usage(int status) { - if (err) - fprintf(stderr, "\n** Error:\n %s\n", err); fprintf(stderr, "\nUsage:\n" - "repomdxml2solv [-a][-h][-k][-n <attrname>]\n" + "repomdxml2solv [-q query]\n" " reads a 'repomd.xml' file from <stdin> and writes a .solv file to <stdout>\n" + " -q : query a repomd data entry\n" " -h : print help & exit\n" ); - exit(0); + exit(status); +} + +static void +doquery(Pool *pool, Repo *repo, const char *query) +{ + Id id, type = 0; + char qbuf[256]; + const char *qp; + Dataiterator di; + + qp = strchr(query, ':'); + if (qp) + { + type = strn2id(pool, query, qp - query, 0); + if (!type) + exit(0); + qp++; + } + else + qp = query; + snprintf(qbuf, sizeof(qbuf), "repository:repomd:%s", qp); + id = str2id(pool, qbuf, 0); + if (!id) + exit(0); + dataiterator_init(&di, pool, repo, SOLVID_META, id, 0, 0); + dataiterator_prepend_keyname(&di, REPOSITORY_REPOMD); + while (dataiterator_step(&di)) + { + if (type) + { + dataiterator_setpos_parent(&di); + if (pool_lookup_id(pool, SOLVID_POS, REPOSITORY_REPOMD_TYPE) != type) + continue; + } + switch (di.key->type) + { + case REPOKEY_TYPE_ID: + case REPOKEY_TYPE_CONSTANTID: + printf("%s\n", id2str(pool, di.kv.id)); + break; + case REPOKEY_TYPE_STR: + printf("%s\n", di.kv.str); + break; + case REPOKEY_TYPE_NUM: + printf("%d\n", di.kv.num); + break; + case REPOKEY_TYPE_SHA1: + printf("sha1:%s\n", repodata_chk2str(di.data, di.key->type, (unsigned char *)di.kv.str)); + break; + case REPOKEY_TYPE_SHA256: + printf("sha256:%s\n", repodata_chk2str(di.data, di.key->type, (unsigned char *)di.kv.str)); + break; + default: + break; + } + } + dataiterator_free(&di); } int main(int argc, char **argv) { - int flags = 0; + int c, flags = 0; + const char *query = 0; Pool *pool = pool_create(); Repo *repo = repo_create(pool, "<stdin>"); - argv++; - argc--; - while (argc--) + while ((c = getopt (argc, argv, "hq:")) >= 0) { - const char *s = argv[0]; - if (*s++ == '-') - while (*s) - switch (*s++) - { - case 'h': usage(NULL); break; - default : break; - } - argv++; + switch(c) + { + case 'h': + usage(0); + break; + case 'q': + query = optarg; + break; + default: + usage(1); + break; + } } - repo_add_repomdxml(repo, stdin, flags); - tool_write(repo, 0, 0); + if (query) + doquery(pool, repo, query); + else + tool_write(repo, 0, 0); pool_free(pool); exit(0); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0