August 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10740 - in /trunk/sat-solver/bindings: repo.i satsolver.i solvable.i
by kkaempf＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: kkaempf Date: Mon Aug 4 18:50:39 2008 New Revision: 10740 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10740&view=rev Log: enable more Python, still incomplete Modified: trunk/sat-solver/bindings/repo.i trunk/sat-solver/bindings/satsolver.i trunk/sat-solver/bindings/solvable.i Modified: trunk/sat-solver/bindings/repo.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/repo.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/repo.i (original) +++ trunk/sat-solver/bindings/repo.i Mon Aug 4 18:50:39 2008 @@ -10,6 +10,8 @@ %extend Repo { Repo( Pool *pool, const char *reponame ) { return repo_create( pool, reponame ); } + ~Repo() + {} int size() { return $self->nsolvables; } @@ -71,8 +73,23 @@ XSolvable *add( XSolvable *xs ) { return xsolvable_add( $self, xs ); } +#if defined(SWIGRUBY) void each() { repo_xsolvables_iterate( $self, generic_xsolvables_iterate_callback ); } +#endif + +#if defined(SWIGPYTHON) + PyObject *__iter__() + { + fprintf(stderr," Repo.iter()\n"); + return NULL; + } + PyObject *next() + { + fprintf(stderr," Repo.next()\n"); + return NULL; + } +#endif #if defined(SWIGRUBY) /* %rename is rejected by swig for [] */ Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Mon Aug 4 18:50:39 2008 @@ -22,7 +22,28 @@ /* HELPER CODE */ /*=============================================================*/ +#if defined(SWIGPYTHON) +#define Swig_Test(x) (x == Py_None) +#define Swig_True Py_True +#define Swig_False Py_False +#define Swig_Null Py_None +#define Swig_Type PyObject* +#define Swig_Int(x) PyInt_FromLong(x) +#define Swig_String(x) PyString_FromString(x) +#define Swig_Array() PyList_New(0) +#define Swig_Append(x,y) PyList_Append(x,y) +#endif + #if defined(SWIGRUBY) +#define Swig_Test(x) NIL_P(x) +#define Swig_True Qtrue +#define Swig_False Qfalse +#define Swig_Null Qnil +#define Swig_Type VALUE +#define Swig_Int(x) INT2FIX(x) +#define Swig_String(x) rb_str_new2(x) +#define Swig_Array() rb_ary_new() +#define Swig_Append(x,y) rb_ary_push(x,y) #include <ruby.h> #include <rubyio.h> #endif Modified: trunk/sat-solver/bindings/solvable.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solvable.i?r… ============================================================================== --- trunk/sat-solver/bindings/solvable.i (original) +++ trunk/sat-solver/bindings/solvable.i Mon Aug 4 18:50:39 2008 @@ -4,8 +4,6 @@ %{ -#if defined(SWIGRUBY) - /* * iterating over attributes of a (x)solvable ('yield' in Ruby) */ @@ -13,7 +11,7 @@ static int xsolvable_each_attr_callback( Solvable *s, Repodata *data, Repokey *key, KeyValue *kv ) { - static VALUE value = Qnil; + static Swig_Type value = Swig_Null; /* * !! keep the order of case statements according to knownid.h !! @@ -22,68 +20,71 @@ switch( key->type ) { case REPOKEY_TYPE_VOID: - value = Qtrue; + value = Swig_True; break; case REPOKEY_TYPE_CONSTANT: case REPOKEY_TYPE_NUM: case REPOKEY_TYPE_U32: - value = INT2FIX( key->size ); + value = Swig_Int( key->size ); break; case REPOKEY_TYPE_CONSTANTID: - value = INT2FIX( key->size ); + value = Swig_Int( key->size ); break; case REPOKEY_TYPE_ID: if (data->localpool) - value = rb_str_new2( stringpool_id2str( &data->spool, kv->id ) ); + value = Swig_String( stringpool_id2str( &data->spool, kv->id ) ); else - value = rb_str_new2( id2str( data->repo->pool, kv->id ) ); + value = Swig_String( id2str( data->repo->pool, kv->id ) ); break; case REPOKEY_TYPE_DIR: - value = Qnil; + value = Swig_Null; break; case REPOKEY_TYPE_STR: - value = rb_str_new2( kv->str ); + value = Swig_String( kv->str ); break; case REPOKEY_TYPE_IDARRAY: - if (NIL_P(value)) - value = rb_ary_new(); /* create new Array on first call */ + if (Swig_Test(value)) + value = Swig_Array(); /* create new Array on first call */ if (data->localpool) - rb_ary_push( value, rb_str_new2( stringpool_id2str( &data->spool, kv->id ) ) ); + Swig_Append( value, Swig_String( stringpool_id2str( &data->spool, kv->id ) ) ); else - rb_ary_push( value, rb_str_new2( id2str( data->repo->pool, kv->id ) ) ); + Swig_Append( value, Swig_String( id2str( data->repo->pool, kv->id ) ) ); if (kv->eof) break; /* yield ! */ return 0; /* continue loop */ break; case REPOKEY_TYPE_REL_IDARRAY: - value = Qnil; + value = Swig_Null; break; case REPOKEY_TYPE_DIRSTRARRAY: - value = rb_str_new2( repodata_dir2str(data,kv->id, kv->str) ); + value = Swig_String( repodata_dir2str(data,kv->id, kv->str) ); break; case REPOKEY_TYPE_DIRNUMNUMARRAY: - value = rb_ary_new(); - rb_ary_push( value, rb_str_new2( repodata_dir2str(data, kv->id, 0) ) ); - rb_ary_push( value, INT2FIX(kv->num) ); - rb_ary_push( value, INT2FIX(kv->num2) ); + value = Swig_Array(); + Swig_Append( value, Swig_String( repodata_dir2str(data, kv->id, 0) ) ); + Swig_Append( value, Swig_Int(kv->num) ); + Swig_Append( value, Swig_Int(kv->num2) ); break; case REPOKEY_TYPE_MD5: case REPOKEY_TYPE_SHA1: case REPOKEY_TYPE_SHA256: - value = rb_str_new2( repodata_chk2str(data, key->type, (unsigned char *)kv->str)); + value = Swig_String( repodata_chk2str(data, key->type, (unsigned char *)kv->str)); break; case REPOKEY_TYPE_COUNTED: - value = rb_str_new2( kv->eof == 0 ? "open" : kv->eof == 1 ? "next" : "close" ); + value = Swig_String( kv->eof == 0 ? "open" : kv->eof == 1 ? "next" : "close" ); break; default: - value = Qnil; + value = Swig_Null; break; } - VALUE result = rb_ary_new(); - rb_ary_push( result, rb_str_new2( id2str( data->repo->pool, key->name ) ) ); - rb_ary_push( result, value ); + Swig_Type result = Swig_Array(); + Swig_Append( result, Swig_String( id2str( data->repo->pool, key->name ) ) ); + Swig_Append( result, value ); +#if defined(SWIGRUBY) rb_yield( result ); +#endif + return 0; } @@ -95,7 +96,7 @@ static int xsolvable_attr_lookup_callback( void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyValue *kv ) { - VALUE *result = (VALUE *)cbdata; + Swig_Type *result = (Swig_Type *)cbdata; /* * !! keep the order of case statements according to knownid.h !! @@ -104,67 +105,67 @@ switch( key->type ) { case REPOKEY_TYPE_VOID: - *result = Qtrue; + *result = Swig_True; break; case REPOKEY_TYPE_CONSTANT: - *result = INT2FIX( key->size ); + *result = Swig_Int( key->size ); break; case REPOKEY_TYPE_CONSTANTID: - *result = INT2FIX( key->size ); + *result = Swig_Int( key->size ); break; case REPOKEY_TYPE_ID: if (data->localpool) - *result = rb_str_new2( stringpool_id2str( &data->spool, kv->id ) ); + *result = Swig_String( stringpool_id2str( &data->spool, kv->id ) ); else - *result = rb_str_new2( id2str( data->repo->pool, kv->id ) ); + *result = Swig_String( id2str( data->repo->pool, kv->id ) ); break; case REPOKEY_TYPE_NUM: - *result = INT2FIX( kv->num ); + *result = Swig_Int( kv->num ); break; case REPOKEY_TYPE_U32: - *result = INT2FIX( kv->num ); + *result = Swig_Int( kv->num ); break; case REPOKEY_TYPE_DIR: - *result = Qnil; /*FIXME*/ + *result = Swig_Null; /*FIXME*/ break; case REPOKEY_TYPE_STR: - *result = rb_str_new2( kv->str ); + *result = Swig_String( kv->str ); break; case REPOKEY_TYPE_IDARRAY: - if (NIL_P(*result)) - *result = rb_ary_new(); /* create new Array on first call */ + if (Swig_Test(*result)) + *result = Swig_Array(); /* create new Array on first call */ if (data->localpool) - rb_ary_push( *result, rb_str_new2( stringpool_id2str( &data->spool, kv->id ) ) ); + Swig_Append( *result, Swig_String( stringpool_id2str( &data->spool, kv->id ) ) ); else - rb_ary_push( *result, rb_str_new2( id2str( data->repo->pool, kv->id ) ) ); + Swig_Append( *result, Swig_String( id2str( data->repo->pool, kv->id ) ) ); return kv->eof?1:0; break; case REPOKEY_TYPE_REL_IDARRAY: - *result = Qnil; /*FIXME*/ + *result = Swig_Null; /*FIXME*/ break; case REPOKEY_TYPE_DIRSTRARRAY: - *result = Qnil; /*FIXME*/ + *result = Swig_Null; /*FIXME*/ break; case REPOKEY_TYPE_DIRNUMNUMARRAY: - *result = Qnil; /*FIXME*/ + *result = Swig_Null; /*FIXME*/ break; case REPOKEY_TYPE_MD5: - *result = Qnil; /*FIXME*/ + *result = Swig_Null; /*FIXME*/ break; case REPOKEY_TYPE_SHA1: - *result = Qnil; /*FIXME*/ + *result = Swig_Null; /*FIXME*/ break; case REPOKEY_TYPE_SHA256: - *result = Qnil; /*FIXME*/ + *result = Swig_Null; /*FIXME*/ break; default: - *result = Qnil; + *result = Swig_Null; return 0; break; } return 1; } -#endif /* SWIGRUBY */ + %} @@ -205,7 +206,9 @@ void set_vendor(const char *vendor) { xsolvable_solvable($self)->vendor = str2id( $self->pool, vendor, 1 ); } +#if defined(SWIGRUBY) %rename("to_s") asString(); +#endif const char *asString() { if ( $self->id == ID_NULL ) return ""; @@ -294,6 +297,7 @@ * Attributes (from Repodata / Repokey) */ + #if defined(SWIGRUBY) /* @@ -302,9 +306,13 @@ /* %rename is rejected by swig for [] */ %alias attr "[]"; - VALUE attr( VALUE attrname ) +#endif +#if defined(SWIGPYTHON) + PyObject *attr( const char *name ) +#endif { +#if defined(SWIGRUBY) char *name; if (SYMBOL_P(attrname)) { @@ -317,22 +325,22 @@ } else name = StringValuePtr( attrname ); - +#endif if (!name) - rb_raise( rb_eArgError, "Solvable::[] called with empty arg" ); - + SWIG_exception( SWIG_ValueError, "Attribute name missing" ); + /* key existing in pool ? */ Id key; key = str2id( $self->pool, name, 0); if (key == ID_NULL) - rb_raise( rb_eArgError, "No such attribute '%s'", name ); - - VALUE result = Qnil; + SWIG_exception( SWIG_ValueError, "No such attribute name" ); + + Swig_Type result = Swig_Null; Solvable *s = xsolvable_solvable($self); if (repo_lookup( s, key, xsolvable_attr_lookup_callback, &result )) return result; - - return Qnil; +fail: + return Swig_Null; } /* @@ -352,9 +360,16 @@ /* * check existance of attribute */ + +#if defined(SWIGRUBY) %rename( "attr?" ) attr_exists( VALUE attrname ); VALUE attr_exists( VALUE attrname ) +#endif +#if defined(SWIGPYTHON) + PyObject *attr_exists( const char *name ) +#endif { +#if defined(SWIGRUBY) char *name; if (SYMBOL_P(attrname)) { @@ -367,16 +382,14 @@ } else name = StringValuePtr( attrname ); +#endif if (!name) - return Qfalse; - + return Swig_False; /* key existing in pool ? */ Id key; key = str2id( $self->pool, name, 0); - return (key == ID_NULL) ? Qfalse : Qtrue; + return (key == ID_NULL) ? Swig_False : Swig_True; } - -#endif /* SWIGRUBY */ } -- 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] r10739 - /trunk/sat-solver/src/knownid.h
by kkaempf＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: kkaempf Date: Mon Aug 4 17:59:40 2008 New Revision: 10739 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10739&view=rev Log: revert PRODUCT_xxx to SOLVALBLE_xxx add PRODUCT_REFERENCES Modified: trunk/sat-solver/src/knownid.h Modified: trunk/sat-solver/src/knownid.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/knownid.h?rev=107… ============================================================================== --- trunk/sat-solver/src/knownid.h (original) +++ trunk/sat-solver/src/knownid.h Mon Aug 4 17:59:40 2008 @@ -153,11 +153,8 @@ KNOWNID(PRODUCT_EXTRAURLS, "product:extraurls"), KNOWNID(PRODUCT_OPTIONALURLS, "product:optionalurls"), KNOWNID(PRODUCT_FLAGS, "product:flags"), -KNOWNID(PRODUCT_NAME, "product:name"), -KNOWNID(PRODUCT_VERSION, "product:version"), KNOWNID(PRODUCT_FLAVOR, "product:flavor"), -KNOWNID(PRODUCT_DISTRIBUTION, "product:distribution"), -KNOWNID(PRODUCT_VENDOR, "product:vendor"), +KNOWNID(PRODUCT_REFERENCES, "product:references"), /* argh */ KNOWNID(SUSETAGS_DATADIR, "susetags:datadir"), -- 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] r10738 - in /trunk/sat-solver/tools: repo_content.c repo_susetags.c
by kkaempf＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: kkaempf Date: Mon Aug 4 17:55:37 2008 New Revision: 10738 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10738&view=rev Log: parse 'content' to separate 'product:...' solvable again Modified: trunk/sat-solver/tools/repo_content.c trunk/sat-solver/tools/repo_susetags.c Modified: trunk/sat-solver/tools/repo_content.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_content.c?… ============================================================================== --- trunk/sat-solver/tools/repo_content.c (original) +++ trunk/sat-solver/tools/repo_content.c Mon Aug 4 17:55:37 2008 @@ -220,8 +220,6 @@ Repodata *data; Id handle = 0; int contentstyle = 0; - char *product_name = 0; - char *product_version = 0; memset(&pd, 0, sizeof(pd)); line = sat_malloc(1024); @@ -283,33 +281,12 @@ if (code11 && istag ("REFERENCES")) { - char *vals[3]; - Id nameid; - Id evrid = 0; - - if (split(value, vals, 3) == 3) - { - if (!strcmp(vals[1], "=")) - { - nameid = str2id(pool, vals[0], 1); - evrid = str2id(pool, vals[2], 1); - - s = pool_id2solvable(pool, repo_add_solvable(repo)); - repodata_extend(data, s - pool->solvables); - handle = repodata_get_handle(data, s - pool->solvables - repo->start); - - s->name = nameid; - s->evr = evrid; - s->provides = adddep(pool, &pd, s->provides, "product()", 0); - - continue; - } - } - fprintf(stderr, "REFERENCES must be 'name = evr'\n"); - break; + repo_set_id(repo, s - pool->solvables, PRODUCT_REFERENCES, str2id(pool, value, 1)); + continue; } - if (code10 && istag ("PRODUCT")) + if ((code10 && istag ("PRODUCT")) + || (code11 && istag ("NAME"))) { /* Finish old solvable, but only if it wasn't created on demand without seeing a PRODUCT entry. */ @@ -317,7 +294,7 @@ { if (s && s->arch != ARCH_SRC && s->arch != ARCH_NOSRC) s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); - if (s) + if (s && code10) s->supplements = repo_fix_legacy(repo, s->provides, s->supplements, 0); /* Only support one product. */ s = pool_id2solvable(pool, repo_add_solvable(repo)); @@ -339,22 +316,11 @@ } if (istag ("VERSION")) { - if (code11) - { - repo_set_str(repo, s - pool->solvables, PRODUCT_VERSION, value); - product_version = strdup(value); - } - else - /* without a release? but that's like zypp implements it */ - s->evr = makeevr(pool, value); - } - else if (code11 && istag ("NAME")) - { - repo_set_str(repo, s - pool->solvables, PRODUCT_NAME, value); - product_name = strdup(value); + /* without a release? but that's like zypp implements it */ + s->evr = makeevr(pool, value); } else if (code11 && istag ("DISTRIBUTION")) - repo_set_str(repo, s - pool->solvables, PRODUCT_DISTRIBUTION, value); + repo_set_str(repo, s - pool->solvables, SOLVABLE_DISTRIBUTION, value); else if (code11 && istag ("FLAVOR")) repo_set_str(repo, s - pool->solvables, PRODUCT_FLAVOR, value); else if (istag ("DATADIR")) @@ -377,10 +343,7 @@ repodata_add_poolstr_array(data, handle, PRODUCT_RELNOTESURL, value); else if (istag ("VENDOR")) { - if (code11) - repo_set_str(repo, s - pool->solvables, PRODUCT_VENDOR, value); - else - s->vendor = str2id(pool, value, 1); + s->vendor = str2id(pool, value, 1); } /* @@ -435,31 +398,14 @@ fprintf(stderr, "No product solvable created !\n"); exit(1); } - if (code11) - { - if (!product_name) - { - fprintf(stderr, "Product must have a name !\n"); - exit(1); - } - if (!product_version) - { - fprintf(stderr, "Product must have a version !\n"); - exit(1); - } - const char *product = join(&pd, "product(", product_name, ")"); - s->provides = adddep(pool, &pd, s->provides, join(&pd, product, " = ", product_version), 0); - free(product_version); - free(product_name); - } - if (code10) + if (!s->arch) + s->arch = ARCH_NOARCH; + if (s->arch != ARCH_SRC && s->arch != ARCH_NOSRC) { - if (!s->arch) - s->arch = ARCH_NOARCH; - if (s->arch != ARCH_SRC && s->arch != ARCH_NOSRC) - s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); - s->supplements = repo_fix_legacy(repo, s->provides, s->supplements, 0); + s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); + if (code10) + s->supplements = repo_fix_legacy(repo, s->provides, s->supplements, 0); } if (pd.tmp) Modified: trunk/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.c… ============================================================================== --- trunk/sat-solver/tools/repo_susetags.c (original) +++ trunk/sat-solver/tools/repo_susetags.c Mon Aug 4 17:55:37 2008 @@ -495,8 +495,6 @@ { if (!strncmp (id2str(pool, pool->solvables[product].name), "product:", 8)) vendor = pool->solvables[product].vendor; - else - vendor = str2id(pool, repo_lookup_str(pool->solvables + product, PRODUCT_VENDOR), 0); } memset(&pd, 0, sizeof(pd)); @@ -678,40 +676,28 @@ /* Now see if we know this solvable already. If we found neither the name nor the arch at all in this repo there's no chance of finding the exact solvable either. */ - if (name && arch) + if (name && arch && (indesc >= 2)) { - if (product && (name == pool->solvables[product].name)) + int n, nn; + /* Now look for a solvable with the given name,evr,arch. + Our input is structured so, that the second set of =Pkg + lines comes in roughly the same order as the first set, so we + have a hint at where to start our search, namely were we found + the last entry. */ + for (n = repo->start, nn = n + last_found_pack; n < repo->end; n++, nn++) { - s = pool->solvables + product; - s->vendor = vendor; - s->arch = arch; - s->evr = evr; - handle = repodata_get_handle(data, s - pool->solvables - repo->start); - last_found_pack = (s - pool->solvables) - repo->start; + if (nn >= repo->end) + nn = repo->start; + s = pool->solvables + nn; + if (s->repo == repo && s->name == name && s->evr == evr && s->arch == arch) + break; } - else if (indesc >= 2) + if (n == repo->end) + s = 0; + else { - int n, nn; - /* Now look for a solvable with the given name,evr,arch. - Our input is structured so, that the second set of =Pkg - lines comes in roughly the same order as the first set, so we - have a hint at where to start our search, namely were we found - the last entry. */ - for (n = repo->start, nn = n + last_found_pack; n < repo->end; n++, nn++) - { - if (nn >= repo->end) - nn = repo->start; - s = pool->solvables + nn; - if (s->repo == repo && s->name == name && s->evr == evr && s->arch == arch) - break; - } - if (n == repo->end) - s = 0; - else - { - last_found_pack = nn - repo->start; - handle = repodata_get_handle(data, last_found_pack); - } + last_found_pack = nn - repo->start; + handle = repodata_get_handle(data, last_found_pack); } } -- 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] r10737 - in /trunk/sat-solver/bindings/python/tests: loading.py pool.py
by kkaempf＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: kkaempf Date: Mon Aug 4 14:49:57 2008 New Revision: 10737 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10737&view=rev Log: - start with Python examples by moving Ruby code - use Pythons 'unittest' Added: trunk/sat-solver/bindings/python/tests/pool.py Modified: trunk/sat-solver/bindings/python/tests/loading.py Modified: trunk/sat-solver/bindings/python/tests/loading.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/loading.py (original) +++ trunk/sat-solver/bindings/python/tests/loading.py Mon Aug 4 14:49:57 2008 @@ -1,3 +1,13 @@ +import unittest + import sys -sys.path.append('../../../build/bindings/python') -import satsolver +sys.path.insert(0, '../../../build/bindings/python') + +class TestSequenceFunctions(unittest.TestCase): + + def testloading(self): + import satsolver + + +if __name__ == '__main__': + unittest.main() \ No newline at end of file Added: trunk/sat-solver/bindings/python/tests/pool.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/pool.py (added) +++ trunk/sat-solver/bindings/python/tests/pool.py Mon Aug 4 14:49:57 2008 @@ -0,0 +1,41 @@ +# +# The Pool is the main data structure for sat-solver. +# +# It contains all solvables, grouped by Repo(sitorie)s +# and is needed to create instances of other classes. +# +# For Solvable, Repo, Transaction, Solver and Relation, +# Pool provides create_... methods as counterparts to +# the instance contructors, all requiring a Pool argument. +# +# The main object within a Pool is the Solvable. So Pool.size, +# Pool.each, Pool.get (resp. Pool[]) and Pool.find all operate +# on Solvables. +# +# For Repos there is each_repo, count_repos, get_repo and find_repo. +# + +import unittest + +import sys +sys.path.insert(0, '../../../build/bindings/python') + +import satsolver + +class TestSequenceFunctions(unittest.TestCase): + def testpool(self): + pool = satsolver.Pool() + assert pool + assert pool.count_repos() == 0 + + def testpool1(self): + pool = satsolver.Pool() + assert pool + pool.set_arch("i686") + + def testpool2(self): + pool = satsolver.Pool("i686") + assert pool + +if __name__ == '__main__': + unittest.main() -- 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] r10736 - in /trunk/sat-solver/tools: repo_rpmmd.c rpmmd2solv.c
by kkaempf＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: kkaempf Date: Mon Aug 4 12:32:34 2008 New Revision: 10736 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10736&view=rev Log: prepare to parse diskusage and translations through rpmmd files (backup checkin) Modified: trunk/sat-solver/tools/repo_rpmmd.c trunk/sat-solver/tools/rpmmd2solv.c Modified: trunk/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmmd.c (original) +++ trunk/sat-solver/tools/repo_rpmmd.c Mon Aug 4 12:32:34 2008 @@ -178,6 +178,7 @@ { NUMSTATES} }; + struct parsedata { struct parsedata_common common; char *kind; @@ -200,8 +201,12 @@ Repodata *data; Id handle; XML_Parser *parser; + Id (*dirs)[3]; // dirid, size, nfiles + int ndirs; + Id langcache[ID_NUM_INTERNAL]; }; + static Id makeevr_atts(Pool *pool, struct parsedata *pd, const char **atts) { Modified: trunk/sat-solver/tools/rpmmd2solv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/rpmmd2solv.c?re… ============================================================================== --- trunk/sat-solver/tools/rpmmd2solv.c (original) +++ trunk/sat-solver/tools/rpmmd2solv.c Mon Aug 4 12:32:34 2008 @@ -59,11 +59,12 @@ usage(int status) { fprintf(stderr, "\nUsage:\n" - "rpmmd2solv [-a][-h][-k][-n <attrname>]\n" - " reads a 'rpmmd' repository from <stdin> and writes a .solv file to <stdout>\n" + "rpmmd2solv [-a][-h][-k][-n <attrname>][-l <locale>]\n" + " reads 'primary' from a 'rpmmd' repository from <stdin> and writes a .solv file to <stdout>\n" " -h : print help & exit\n" " -k : don't mix kinds (experimental!)\n" " -n <name>: save attributes as <name>.attr\n" + " -l <locale>: parse localization data for <locale>\n" ); exit(status); } @@ -75,12 +76,12 @@ const char *attrname = 0; const char *basefile = 0; const char *dir = 0; - + const char *locale = 0; Pool *pool = pool_create(); Repo *repo = repo_create(pool, "<stdin>"); - while ((c = getopt (argc, argv, "hkn:b:d:")) >= 0) + while ((c = getopt (argc, argv, "hkn:b:d:l:")) >= 0) { switch(c) { @@ -99,6 +100,9 @@ case 'd': dir = optarg; break; + case 'l': + locale = optarg; + break; default: usage(1); break; @@ -109,9 +113,9 @@ FILE *fp; int l; char *fnp; - l = strlen(dir); - fnp = sat_malloc(l + 20); - sprintf(fnp, "%s/primary.xml.gz", dir); + l = strlen(dir) + 128; + fnp = sat_malloc(l+1); + snprintf(fnp, l, "%s/primary.xml.gz", dir); if (!(fp = myfopen(fnp))) { perror(fnp); @@ -119,6 +123,39 @@ } repo_add_rpmmd(repo, fp, flags); fclose(fp); + snprintf(fnp, l, "%s/diskusage.xml.gz", dir); + if ((fp = myfopen(fnp))) + { + repo_add_rpmmd(repo, fp, flags); + fclose(fp); + } + if (locale) + { + if (snprintf(fnp, l, "%s/translation-%s.xml.gz", dir, locale) >= l) + { + fprintf(stderr, "-l parameter too long\n"); + exit(1); + } + while (!(fp = myfopen(fnp))) + { + fprintf(stderr, "not opened %s\n", fnp); + if (strlen(locale) > 2) + { + if (snprintf(fnp, l, "%s/translation-%.2s.xml.gz", dir, locale) >= l) + { + fprintf(stderr, "-l parameter too long\n"); + exit(1); + } + if ((fp = myfopen(fnp))) + break; + } + perror(fnp); + exit(1); + } + fprintf(stderr, "opened %s\n", fnp); + repo_add_rpmmd(repo, fp, flags); + fclose(fp); + } sat_free(fnp); } else -- 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] r10735 - in /trunk/libzypp-bindings: examples/python/list_resolvables.py swig/RepoInfo.i swig/zypp.i
by mlandres＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: mlandres Date: Mon Aug 4 12:29:33 2008 New Revision: 10735 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10735&view=rev Log: Geneerate bindings for RepoInfoBase and ServiceInfo Modified: trunk/libzypp-bindings/examples/python/list_resolvables.py trunk/libzypp-bindings/swig/RepoInfo.i trunk/libzypp-bindings/swig/zypp.i Modified: trunk/libzypp-bindings/examples/python/list_resolvables.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/examples/python… ============================================================================== --- trunk/libzypp-bindings/examples/python/list_resolvables.py (original) +++ trunk/libzypp-bindings/examples/python/list_resolvables.py Mon Aug 4 12:29:33 2008 @@ -4,7 +4,7 @@ Z = zypp.ZYppFactory_instance().getZYpp() Z.initializeTarget( zypp.Pathname("/") ) -Z.addResolvables( Z.target().resolvables(), True ); +Z.target().load(); repoManager = zypp.RepoManager() repos = repoManager.knownRepositories() @@ -14,8 +14,7 @@ continue if not repoManager.isCached( repo ): repoManager.buildCache( repo ) - - Z.addResolvables( repoManager.createFromCache( repo ).resolvables() ) + repoManager.loadFromCache( repo ); print "Items: %d" % ( Z.pool().size() ) @@ -25,9 +24,9 @@ t = "i" else: t = "*" - print "%s %s:%s-%s.%s\t(%s)" % ( t, - item.resolvable().kind(), - item.resolvable().name(), - item.resolvable().edition(), - item.resolvable().arch(), - item.resolvable().repository().info().alias() ) + print "%s %s" % ( t , item.resolvable()) + #print "%s %s:%s-%s.%s\t(%s)" % ( t, + # item.resolvable().kind(), + ## item.resolvable().edition(), + # item.resolvable().arch(), + # item.resolvable().repository().info().alias() ) Modified: trunk/libzypp-bindings/swig/RepoInfo.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/RepoInfo.i… ============================================================================== --- trunk/libzypp-bindings/swig/RepoInfo.i (original) +++ trunk/libzypp-bindings/swig/RepoInfo.i Mon Aug 4 12:29:33 2008 @@ -3,6 +3,19 @@ %template(UrlSet) std::set<Url>; #endif +namespace zypp +{ + namespace repo + { + %ignore operator==; + %ignore operator!=; + %ignore operator<<; + %ignore operator<; + } +} +%include <zypp/repo/RepoInfoBase.h> + + // This is due to a typo in libzypp < 5.4.0 %ignore zypp::RepoInfo::defaultPrioity(); Modified: trunk/libzypp-bindings/swig/zypp.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev… ============================================================================== --- trunk/libzypp-bindings/swig/zypp.i (original) +++ trunk/libzypp-bindings/swig/zypp.i Mon Aug 4 12:29:33 2008 @@ -121,6 +121,7 @@ %include "SrcPackage.i" %include "RepoType.i" %include "RepoInfo.i" +%include "ServiceInfo.i" %include "Repository.i" %include "RepoStatus.i" %include "RepoManager.i" -- 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] r10734 - /trunk/repotools/du2xml.rb
by kkaempf＠svn.opensuse.org 04 Aug '08

04 Aug '08

Author: kkaempf Date: Mon Aug 4 11:22:53 2008 New Revision: 10734 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10734&view=rev Log: convert packages.DU to diskusage.xml Added: trunk/repotools/du2xml.rb Added: trunk/repotools/du2xml.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/du2xml.rb?rev=10734&vi… ============================================================================== --- trunk/repotools/du2xml.rb (added) +++ trunk/repotools/du2xml.rb Mon Aug 4 11:22:53 2008 @@ -0,0 +1,57 @@ +# +# packages.DU stream(!) converter +# +# Parses packages.DU of a 'sustags' source +# and outputs .xml + +require 'zypptools/input/tagparser' + +class Diskusage < TagParser + + attr_reader :store, :arch + + def Ver version + raise "Invalid version" unless version == "2.0" + end + + # =Pkg: name vers rel arch + # 0 1 2 3 + + def Pkg value + finish + x = value.split " " + n = x.size > 0 ? "name=\"#{x[0]}\"" : '' + v = x.size > 1 ? "version=\"#{x[1]}\"" : '' + r = x.size > 2 ? "release=\"#{x[2]}\"" : '' + a = x.size > 3 ? "arch=\"#{x[3]}\"" : '' + puts "<duinfo #{n} #{v} #{r} #{a}>" + @pending = true + end + + def Dir value + puts ' <dirs>' + value.each do |dirline| + x = dirline.split " " + puts " <dir name=\"#{x[0]}\" d1=\"#{x[1]}\" d2=\"#{x[2]}\" d3=\"#{x[3]}\" d4=\"#{x[4]}\"/>" + end + puts ' </dirs>' + end + + def finish + puts '</duinfo>' if @pending + @pending = false + end + + def method_missing meth, *args + return if #missing.has_key? meth +STDERR.puts "#{meth} is missing" + @missing[meth] = true + end + +end + + +puts '<?xml version="1.0" encoding="UTF-8"?>' +puts "<diskusage>" +Diskusage.new "packages.DU" +puts "</diskusage>" -- 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] r10733 - in /trunk/zypper: doc/zypper.8 package/zypper.changes src/Zypper.cc
by jkupec＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: jkupec Date: Sat Aug 2 21:11:55 2008 New Revision: 10733 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10733&view=rev Log: - typo - changes - man page update Modified: trunk/zypper/doc/zypper.8 trunk/zypper/package/zypper.changes trunk/zypper/src/Zypper.cc Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=10733&r1… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Sat Aug 2 21:11:55 2008 @@ -57,6 +57,13 @@ to download and check the index files, and you will be able to use zypper for operations like search or info without internet access or root privileges. +.SS Services +.LP +Repository Index Service (RIS) is a special type of repository which contains +a list of other repositories. This list can be generated dynamically by the +server according to some URI parameters or user name, or can be static. +See Service Management section for more details. + .SS Package Types .LP zypper works with several types of resource objects, called @@ -703,6 +710,29 @@ .I \-a, \-\-all Clean both repository metadata and package caches. + +.SS Serivce Management + +(This group of commands is currently under development) + +.TP +.B addservice (as) [options] <url> <alias> +TODO + +.TP +.B removeservice (rs) [options] <alias|#|URI> ... +TODO + +.TP +.B services (ls) [options] +TODO + +.TP +.B refresh-services (refs) [options] <alias|#|URI> ... +TODO + + + .SS Package Locks Management Package locks server the purpose of preventing changes to the set of installed packages on the system. The locks are stored in form of a \fIquery\fR in Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Sat Aug 2 21:11:55 2008 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Sat Aug 2 19:40:37 CEST 2008 - jkupec(a)suse.cz + +- service handling improved, ls, rs, refs now allow to specify + services by #, alias, or URI as in repos +- 'ls' and 'refs' corrected to work with proper service list + (repo index services + non-index repos not belonging to any + service) +- r10731 +- 0.12.1 + +------------------------------------------------------------------- Tue Jul 29 15:10:22 CEST 2008 - jkupec(a)suse.cz - say Retrieving instead of Downloading when getting files Modified: trunk/zypper/src/Zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=10733&r… ============================================================================== --- trunk/zypper/src/Zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Sat Aug 2 21:11:55 2008 @@ -199,7 +199,7 @@ "\tservices, ls\t\tList all defined services.\n" "\taddservice, as\t\tAdd a new service.\n" "\tremoveservice, rs\tRemove specified service.\n" - "\trefreshservice, refs\tRefresh all services.\n" + "\trefresh-services, refs\tRefresh all services.\n" ); static string help_package_commands = _("\tSoftware Management:\n" -- 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] r10732 - /trunk/libzypp/zypp/parser/RepoindexFileReader.cc
by jkupec＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: jkupec Date: Sat Aug 2 20:32:08 2008 New Revision: 10732 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10732&view=rev Log: - compile Modified: trunk/libzypp/zypp/parser/RepoindexFileReader.cc Modified: trunk/libzypp/zypp/parser/RepoindexFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/RepoindexFil… ============================================================================== --- trunk/libzypp/zypp/parser/RepoindexFileReader.cc (original) +++ trunk/libzypp/zypp/parser/RepoindexFileReader.cc Sat Aug 2 20:32:08 2008 @@ -13,6 +13,7 @@ #include "zypp/base/String.h" #include "zypp/base/Logger.h" +#include "zypp/base/Gettext.h" #include "zypp/RepoInfo.h" @@ -110,7 +111,7 @@ path_s = s.asString(); if (url_s.empty() && path_s.empty()) - throw ParseException(_("One or both of 'url' or 'path' attributes is required.")); + throw ParseException(str::form(_("One or both of '%s' or '%s' attributes is required."), "url", "path")); //! \todo FIXME this hardcodes the "/repo/" fragment - should not be if we want it to be usable by others! else if (url_s.empty()) info.setPath(Pathname(string("/repo/") + path_s)); -- 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] r10731 - in /trunk/zypper/src: Zypper.cc repos.cc repos.h utils/misc.h
by jkupec＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: jkupec Date: Sat Aug 2 19:39:43 2008 New Revision: 10731 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10731&view=rev Log: - service handling improved, ls, rs, refs now allow to specify services by #, alias, or URI as in repos - 'ls' and 'refs' corrected Modified: trunk/zypper/src/Zypper.cc trunk/zypper/src/repos.cc trunk/zypper/src/repos.h trunk/zypper/src/utils/misc.h Modified: trunk/zypper/src/Zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=10731&r… ============================================================================== --- trunk/zypper/src/Zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Sat Aug 2 19:39:43 2008 @@ -1052,7 +1052,7 @@ { static struct option options[] = { {"help", no_argument, 0, 'h'}, - {"repos", no_argument, 0, 'r'}, + {"no-repos", no_argument, 0, 'R'}, {0, 0, 0, 0} }; specific_options = options; @@ -1062,7 +1062,7 @@ "Refresh defined repository index services.\n" "\n" " Command options:\n" - "-r, --repos Refresh also repositories of the services.\n" + "-R, --no-repos Do not refresh non-index services (plain repositories).\n" ); break; } @@ -1255,6 +1255,7 @@ {"build-only", no_argument, 0, 'B'}, {"download-only", no_argument, 0, 'D'}, {"repo", required_argument, 0, 'r'}, + {"services", no_argument, 0, 's'}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; @@ -1272,6 +1273,7 @@ "-B, --build-only Only build the database, don't download metadata.\n" "-D, --download-only Only download raw metadata, don't build the database.\n" "-r, --repo <alias|#|URI> Refresh only specified repositories.\n" + "-s, --services Refresh also services before refreshing repos.\n" ); break; } @@ -2081,10 +2083,6 @@ refresh_services(*this); - // refresh also repos - if (copts.count("repos")) - refresh_repos(*this); - break; } @@ -2142,59 +2140,6 @@ break; } - // --------------------------( remove service )------------------------------ - - case ZypperCommand::REMOVE_SERVICE_e: - { - if (runningHelp()) { out().info(_command_help, Out::QUIET); return; } - - // check root user - if (geteuid() != 0 && !globalOpts().changedRoot) - { - out().error( - _("Root privileges are required for modifying system services.")); - setExitCode(ZYPPER_EXIT_ERR_PRIVILEGES); - return; - } - - if (_arguments.size() < 1) - { - out().error(_("Required argument missing.")); - ERR << "Required argument missing." << endl; - print_usage(out(), _command_help); - setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); - return; - } - - warn_if_zmd(); - - set<ServiceInfo, ServiceAliasComparator> to_remove; - for (vector<string>::const_iterator it = _arguments.begin(); - it != _arguments.end(); ++it) - { - ServiceInfo s; - if (match_service(*this, *it, &s)) - { - to_remove.insert(s); - } - else - { - MIL << "Service not found by given alias, number or URI." << endl; - out().error(boost::str(format( - // translators: %s is the supplied command line argument which - // for which no service counterpart was found - _("Service '%s' not found by alias, number or URI.")) % *it)); - } - } - - for_ (it, to_remove.begin(), to_remove.end()) - { - remove_service(*this, *it); - } - - break; - } - // --------------------------( repo list )---------------------------------- case ZypperCommand::LIST_REPOS_e: @@ -2350,6 +2295,7 @@ // --------------------------( delete repo )-------------------------------- + case ZypperCommand::REMOVE_SERVICE_e: case ZypperCommand::REMOVE_REPO_e: { if (runningHelp()) { out().info(_command_help, Out::QUIET); return; } @@ -2358,7 +2304,9 @@ if (geteuid() != 0 && !globalOpts().changedRoot) { out().error( - _("Root privileges are required for modifying system repositories.")); + command() == ZypperCommand::REMOVE_REPO ? + _("Root privileges are required for modifying system repositories.") : + _("Root privileges are required for modifying system services.")); setExitCode(ZYPPER_EXIT_ERR_PRIVILEGES); return; } @@ -2374,28 +2322,59 @@ warn_if_zmd (); - // must store repository before remove to ensure correct match number - set<RepoInfo,RepoInfoAliasComparator> repo_to_remove; - for (vector<string>::const_iterator it = _arguments.begin(); - it != _arguments.end(); ++it) + if (command() == ZypperCommand::REMOVE_REPO) { - RepoInfo repo; - if (match_repo(*this,*it,&repo)) + // must store repository before remove to ensure correct match number + set<RepoInfo,RepoInfoAliasComparator> repo_to_remove; + for_(it, _arguments.begin(), _arguments.end()) { - repo_to_remove.insert(repo); + RepoInfo repo; + if (match_repo(*this,*it,&repo)) + { + repo_to_remove.insert(repo); + } + else + { + MIL << "Repository not found by given alias, number or URI." << endl; + out().error(boost::str(format( + // translators: %s is the supplied command line argument which + // for which no repository counterpart was found + _("Repository '%s' not found by alias, number or URI.")) % *it)); + } } - else + + for_(it, repo_to_remove.begin(), repo_to_remove.end()) + remove_repo(*this,*it); + } + else + { + set<repo::RepoInfoBase_Ptr, ServiceAliasComparator> to_remove; + for_(it, _arguments.begin(), _arguments.end()) { - MIL << "Repository not found by given alias, number or URI." << endl; - out().error(boost::str(format( - // translators: %s is the supplied command line argument which - // for which no repository counterpart was found - _("Repository '%s' not found by alias, number or URI.")) % *it)); + repo::RepoInfoBase_Ptr s; + if (match_service(*this, *it, s)) + { + to_remove.insert(s); + } + else + { + MIL << "Service not found by given alias, number or URI." << endl; + out().error(boost::str(format( + // translators: %s is the supplied command line argument which + // for which no service counterpart was found + _("Service '%s' not found by alias, number or URI.")) % *it)); + } } - } - for_ (it,repo_to_remove.begin(),repo_to_remove.end()) - remove_repo(*this,*it); + for_(it, to_remove.begin(), to_remove.end()) + { + RepoInfo_Ptr repo_ptr = dynamic_pointer_cast<RepoInfo>(*it); + if (repo_ptr) + remove_repo(*this, *repo_ptr); + else + remove_service(*this, *dynamic_pointer_cast<ServiceInfo>(*it)); + } + } break; } @@ -2532,10 +2511,20 @@ if (globalOpts().no_refresh) out().warning(boost::str(format( - _("The '%s' global option has no effect here.")) - % "--no-refresh")); + _("The '%s' global option has no effect here.")) % "--no-refresh")); - refresh_services(*this); + // by default refresh only repositories + if (copts.count("services")) + { + if (!_arguments.empty()) + { + out().error(str::form( + _("Arguments are not allowed if '%s' is used."), "--services")); + setExitCode(ZYPPER_EXIT_ERR_PRIVILEGES); + return; + } + refresh_services(*this); + } refresh_repos(*this); break; } Modified: trunk/zypper/src/repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.cc?rev=10731&r1… ============================================================================== --- trunk/zypper/src/repos.cc (original) +++ trunk/zypper/src/repos.cc Sat Aug 2 19:39:43 2008 @@ -41,6 +41,8 @@ extern ZYpp::Ptr God; extern RuntimeData gData; +typedef list<RepoInfoBase_Ptr> ServiceList; + // ---------------------------------------------------------------------------- template <typename Target, typename Source> @@ -83,11 +85,14 @@ { RepoManager::RefreshCheckStatus stat = manager. checkIfToRefreshMetadata(repo, *it, - zypper.command() == ZypperCommand::REFRESH ? + zypper.command() == ZypperCommand::REFRESH || + zypper.command() == ZypperCommand::REFRESH_SERVICES ? RepoManager::RefreshIfNeededIgnoreDelay : RepoManager::RefreshIfNeeded); do_refresh = (stat == RepoManager::REFRESH_NEEDED); - if (!do_refresh && zypper.command() == ZypperCommand::REFRESH) + if (!do_refresh && + (zypper.command() == ZypperCommand::REFRESH || + zypper.command() == ZypperCommand::REFRESH_SERVICES)) { switch (stat) { @@ -128,7 +133,8 @@ manager.refreshMetadata(repo, force_download ? RepoManager::RefreshForced : - zypper.command() == ZypperCommand::REFRESH ? + zypper.command() == ZypperCommand::REFRESH || + zypper.command() == ZypperCommand::REFRESH_SERVICES ? RepoManager::RefreshIfNeededIgnoreDelay : RepoManager::RefreshIfNeeded); @@ -302,6 +308,39 @@ // --------------------------------------------------------------------------- +/** \return true if aliases are equal, and all lhs urls can be found in rhs */ +static bool repo_cmp_alias_urls(const RepoInfo & lhs, const RepoInfo & rhs) +{ + bool equals = true; + + // alias + if (lhs.alias() != rhs.alias()) + { + equals = false; + } + else + { + // URIs (all of them must be in the other RepoInfo) + bool urlfound = false; + for (RepoInfo::urls_const_iterator urlit = lhs.baseUrlsBegin(); + urlit != lhs.baseUrlsEnd(); ++urlit) + { + if (find(rhs.baseUrlsBegin(), rhs.baseUrlsEnd(), Url(*urlit)) + != rhs.baseUrlsEnd()) + urlfound = true; + if (!urlfound) + { + equals = false; + break; + } + } + } + + return equals; +} + +// --------------------------------------------------------------------------- + /** * Try to find RepoInfo counterparts among known repositories by alias, number, * or URI, based on the list of strings given as the iterator range \a being and @@ -313,12 +352,11 @@ const T & begin, const T & end, list<RepoInfo> & repos, list<string> & not_found) { - for (T it = begin; it != end; ++it) { RepoInfo repo; - if (!match_repo(zypper,*it,&repo)) + if (!match_repo(zypper, *it, &repo)) { not_found.push_back(*it); continue; @@ -331,27 +369,7 @@ for (list<RepoInfo>::const_iterator repo_it = repos.begin(); repo_it != repos.end(); ++repo_it) { - bool equals = true; - - // alias - if (repo_it->alias() != repo.alias()) - { - equals = false; - } - else - { - // URIs (all of them) - for (RepoInfo::urls_const_iterator urlit = repo_it->baseUrlsBegin(); - urlit != repo_it->baseUrlsEnd(); ++urlit) - try { - if (find(repo.baseUrlsBegin(),repo.baseUrlsEnd(),Url(*it)) - != repo.baseUrlsEnd()) - equals = false; - } - catch(const url::UrlException &){} - } - - if (equals) + if (repo_cmp_alias_urls(repo, *repo_it)) { duplicate = true; break; @@ -370,13 +388,14 @@ */ static void report_unknown_repos(Out & out, list<string> not_found) { - for (list<string>::iterator it = not_found.begin(); - it != not_found.end(); ++it) + for_(it, not_found.begin(), not_found.end()) out.error(boost::str(format( _("Repository '%s' not found by its alias, number, or URI.")) % *it)); if (!not_found.empty()) - out.info(_("Use 'zypper repos' to get the list of defined repositories.")); + out.info(str::form( + _("Use '%s' to get the list of defined repositories."), + "zypper repos")); } // --------------------------------------------------------------------------- @@ -872,8 +891,7 @@ ostringstream s; s << _("Specified repositories: "); - for (list<RepoInfo>::const_iterator it = specified.begin(); - it != specified.end(); ++it) + for_(it, specified.begin(), specified.end()) s << it->alias() << " "; zypper.out().info(s.str(), Out::HIGH); @@ -940,8 +958,9 @@ // print the result message if (enabled_repo_count == 0) { - string hint = - _("Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."); + string hint = str::form( + _("Use '%s' or '%s' commands to add or enable repositories."), + "zypper addrepo", "zypper modifyrepo"); if (!specified.empty() || !not_found.empty()) zypper.out().error(_("Specified repositories are not enabled or defined."), hint); else @@ -970,6 +989,8 @@ /** \return false on success, true on error */ bool refresh_repo(Zypper & zypper, const zypp::RepoInfo & repo) { + MIL << "going to refresh repo '" << repo.alias() << "'" << endl; + // raw metadata refresh bool error = false; if (!zypper.cOpts().count("build-only")) @@ -1756,8 +1777,156 @@ // Service Handling // --------------------------------------------------------------------------- +static ServiceList get_all_services(Zypper & zypper) +{ + RepoManager manager(zypper.globalOpts().rm_options); + ServiceList services; + + try + { + // RIS type services + for_(it, manager.serviceBegin(), manager.serviceEnd()) + { + ServiceInfo_Ptr s = new ServiceInfo(*it); + services.insert(services.end(), s); + } + + // non-services repos + for_(it, manager.repoBegin(), manager.repoEnd()) + { + if (!it->service().empty()) + continue; + RepoInfo_Ptr r = new RepoInfo(*it); + services.insert(services.end(), r); + } + } + catch ( const Exception &e ) + { + ZYPP_CAUGHT(e); + zypper.out().error(e, _("Error reading services:")); + exit(ZYPPER_EXIT_ERR_ZYPP); + } + + return services; +} + +bool match_service(Zypper & zypper, string str, RepoInfoBase_Ptr & service_ptr) +{ + ServiceList known = get_all_services(zypper); + bool found = false; + + unsigned int number = 1; // service number + for (ServiceList::const_iterator known_it = known.begin(); + known_it != known.end(); ++known_it, ++number) + { + unsigned int tmp = 0; + safe_lexical_cast (str, tmp); // try to make an int out of the string + + try + { + found = (*known_it)->alias() == str || tmp == number; + if (!found) + { + ServiceInfo_Ptr s_ptr = dynamic_pointer_cast<ServiceInfo>(*known_it); + if (s_ptr) + found = Url(str) == s_ptr->url(); + else + { + RepoInfo_Ptr r_ptr = dynamic_pointer_cast<RepoInfo>(*known_it); + found = + find(r_ptr->baseUrlsBegin(), r_ptr->baseUrlsEnd(), Url(str)) + != r_ptr->baseUrlsEnd(); + } + } + if (found) + { + service_ptr = *known_it; + break; + } + } + catch(const url::UrlException &){} + + } // END for all known services + + return found; +} + +/** + * Say "Service %s not found" for all strings in \a not_found list. + */ +static void report_unknown_services(Out & out, list<string> not_found) +{ + for_(it, not_found.begin(), not_found.end()) + out.error(boost::str(format( + _("Service '%s' not found by its alias, number, or URI.")) % *it)); + + if (!not_found.empty()) + out.info(str::form( + _("Use '%s' to get the list of defined services."), "zypper repos")); +} + +/** + * Try to find ServiceInfo or RepoInfo counterparts among known services by alias, number, + * or URI, based on the list of strings given as the iterator range \a begin and + * \a end. Matching objects will be added to \a services (as RepoInfoBase_Ptr) and those + * with no match will be added to \a not_found. + */ +template<typename T> +void get_services( Zypper & zypper, + const T & begin, const T & end, + ServiceList & services, list<string> & not_found) +{ + for (T it = begin; it != end; ++it) + { + RepoInfoBase_Ptr service; + + if (!match_service(zypper, *it, service)) + { + not_found.push_back(*it); + continue; + } + + // service found + // is it a duplicate? compare by alias and URIs + //! \todo operator== in RepoInfo? + bool duplicate = false; + for (ServiceList::const_iterator serv_it = services.begin(); + serv_it != services.end(); ++serv_it) + { + ServiceInfo_Ptr s_ptr = dynamic_pointer_cast<ServiceInfo>(*serv_it); + ServiceInfo_Ptr current_service_ptr = dynamic_pointer_cast<ServiceInfo>(service); + + // one is a service, the other is a repo + if (s_ptr && !current_service_ptr) + continue; + + // service + if (s_ptr) + { + if (s_ptr->alias() == current_service_ptr->alias() && + s_ptr->url() == current_service_ptr->url()) + { + duplicate = true; + break; + } + } + // repo + else if (repo_cmp_alias_urls( + *dynamic_pointer_cast<RepoInfo>(service), + *dynamic_pointer_cast<RepoInfo>(*serv_it))) + { + duplicate = true; + break; + } + } // END for all found so far + + if (!duplicate) + services.push_back(service); + } +} + static void print_service_list(Zypper & zypper, - const list<ServiceInfo> & services) + const list<RepoInfoBase_Ptr> & services) { Table tbl; bool all = zypper.cOpts().count("details"); @@ -1785,31 +1954,54 @@ int i = 1; - for (list<ServiceInfo>::const_iterator it = services.begin(); + ServiceInfo_Ptr service; + RepoInfo_Ptr repo; + for (list<RepoInfoBase_Ptr>::const_iterator it = services.begin(); it != services.end(); ++it) { - ServiceInfo service = *it; + RepoInfoBase_Ptr base = *it; + TableRow tr(all ? 8 : showprio || showuri ? 7 : 6); // number tr << str::numstring (i); // alias - tr << service.alias(); + tr << base->alias(); // name - tr << service.name(); + tr << base->name(); // enabled? - tr << (service.enabled() ? _("Yes") : _("No")); + tr << (base->enabled() ? _("Yes") : _("No")); // autorefresh? - tr << ""; + tr << (base->autorefresh() ? _("Yes") : _("No")); + + service = dynamic_pointer_cast<ServiceInfo>(base); + if (!service) + repo = dynamic_pointer_cast<RepoInfo>(base); + // priority if (all || showprio) - tr << ""; + { + if (service) + tr << ""; + else + tr << str::numstring (repo->priority()); + } // type if (all) - tr << "NU"; // ??? + { + if (service) + tr << "NU"; //! \todo check + else + tr << repo->type().asString(); + } // url if (all || showuri) - tr << service.url().asString(); + { + if (service) + tr << service->url().asString(); + else + tr << repo->baseUrlsBegin()->asString(); + } tbl << tr; i++; @@ -1858,21 +2050,7 @@ void list_services(Zypper & zypper) { - RepoManager manager(zypper.globalOpts().rm_options); - list<ServiceInfo> services; - - try - { - services.insert(services.end(), - manager.serviceBegin(), - manager.serviceEnd()); - } - catch ( const Exception &e ) - { - ZYPP_CAUGHT(e); - zypper.out().error(e, _("Error reading services:")); - exit(ZYPPER_EXIT_ERR_ZYPP); - } + ServiceList services = get_all_services(zypper); // export to file or stdout in repo file format if (copts.count("export")) @@ -1986,6 +2164,8 @@ { RepoManager manager(zypper.globalOpts().rm_options); + zypper.out().info(boost::str( + format(_("Removing service '%s':")) % service.name())); manager.removeService(service); zypper.out().info(boost::str( format(_("Service '%s' has been removed.")) % service.name())); @@ -1994,80 +2174,157 @@ // --------------------------------------------------------------------------- -void refresh_services(Zypper & zypper) +static bool refresh_service(Zypper & zypper, const ServiceInfo & service) { - MIL << "going to refresh services" << endl; + MIL << "going to refresh service '" << service.alias() << "'" << endl; RepoManager manager(zypper.globalOpts().rm_options); - list<ServiceInfo> services; + bool error = true; try { - services.insert(services.end(), manager.serviceBegin(), manager.serviceEnd()); + zypper.out().info( + str::form(_("Refreshing service '%s'."), service.name().c_str())); + manager.refreshService(service); + error = false; } - catch (const Exception & e) + catch (const MediaException & e) { ZYPP_CAUGHT(e); - zypper.out().error(e, _("Error reading services:")); + zypper.out().error(e, + str::form( + _("Problem retrieving the repository index file for service '%s':"), + service.name().c_str()), + _("Check if the URI is valid and accessible.")); zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); - return; } - for_(sit, services.begin(), services.end()) - { - ServiceInfo s = *sit; - - try - { - zypper.out().info(str::form(_("Refreshing service '%s'."), s.name().c_str())); - manager.refreshService(s); - } - catch (const MediaException & e) - { - ZYPP_CAUGHT(e); - zypper.out().error(e, - str::form( - _("Problem retrieving the repository index file for service '%s':"), - s.name().c_str()), - _("Check if the URI is valid and accessible.")); - zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); - return; //! \todo continue with the next service - } - } + return error; } // --------------------------------------------------------------------------- -bool match_service(Zypper & zypper, string str, ServiceInfo * service) +void refresh_services(Zypper & zypper) { - RepoManager manager(zypper.globalOpts().rm_options); - list<ServiceInfo> known; - known.insert(known.end(), manager.serviceBegin(), manager.serviceEnd()); - bool found = false; + MIL << "going to refresh services" << endl; - unsigned int number = 1; // repo number - for (list<ServiceInfo>::const_iterator known_it = known.begin(); - known_it != known.end(); ++known_it, ++number) - { - unsigned int tmp = 0; - safe_lexical_cast (str, tmp); // try to make an int out of the string + ServiceList services = get_all_services(zypper); + + // get the list of repos specified on the command line ... + ServiceList specified; + list<string> not_found; + // ...as command arguments + get_services(zypper, zypper.arguments().begin(), zypper.arguments().end(), + specified, not_found); + // ...as --repo options + report_unknown_services(zypper.out(), not_found); - try + unsigned error_count = 0; + unsigned enabled_service_count = services.size(); + + if (!specified.empty() || not_found.empty()) + { + unsigned number = 0; + for_(sit, services.begin(), services.end()) { - if (known_it->alias() == str || - tmp == number || - known_it->url() == Url(str)) + ++number; + RepoInfoBase_Ptr service_ptr(*sit); + + if (!specified.empty()) { - *service = *known_it; - found = true; - break; + bool found = false; + for_(it, specified.begin(), specified.end()) + if ((*it)->alias() == service_ptr->alias()) + { + found = true; + break; + } + + if (!found) + { + DBG << service_ptr->alias() << "(#" << number << ") not specified," + << " skipping." << endl; + --enabled_service_count; + continue; + } } - } - catch(const url::UrlException &){} - } // END for all known repos + // skip disabled services + if (!service_ptr->enabled()) + { + string msg = boost::str( + format(_("Skipping disabled service '%s'")) % service_ptr->name()); + DBG << "skipping disabled service '" << service_ptr->alias() << "'" << endl; - return found; + if (specified.empty()) + zypper.out().info(msg, Out::HIGH); + else + zypper.out().error(msg); + + --enabled_service_count; + continue; + } + + // do the refresh + bool error = false; + ServiceInfo_Ptr s = dynamic_pointer_cast<ServiceInfo>(service_ptr); + if (s) + error = refresh_service(zypper, *s); + else + { + if (zypper.cOpts().count("no-repos")) + { + zypper.out().info(str::form( + "Skipping non-index service '%s' because '%s' is used.", + service_ptr->name().c_str(), "--no-repos")); + continue; + } + error = refresh_repo(zypper, *dynamic_pointer_cast<RepoInfo>(service_ptr)); + } + + if (error) + { + zypper.out().error(boost::str(format( + _("Skipping service '%s' because of the above error.")) + % service_ptr->name())); + ERR << format("Skipping service '%s' because of the above error.") + % service_ptr->name() << endl; + ++error_count; + } + } + } + else + enabled_service_count = 0; + + // print the result message + if (enabled_service_count == 0) + { + string hint = str::form( + _("Use '%s' or '%s' commands to add or enable services."), + "zypper addservice", "zypper modifyservice"); + if (!specified.empty() || !not_found.empty()) + zypper.out().error(_("Specified services are not enabled or defined."), hint); + else + zypper.out().error(_("There are no enabled services defined."), hint); + } + else if (error_count == enabled_service_count) + { + zypper.out().error(_("Could not refresh the services because of errors.")); + zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); + return; + } + else if (error_count) + { + zypper.out().error(_("Some of the services have not been refreshed because of an error.")); + zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); + return; + } + else if (!specified.empty()) + zypper.out().info(_("Specified services have been refreshed.")); + else + zypper.out().info(_("All services have been refreshed.")); + + MIL << "DONE"; } // --------------------------------------------------------------------------- Modified: trunk/zypper/src/repos.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.h?rev=10731&r1=… ============================================================================== --- trunk/zypper/src/repos.h (original) +++ trunk/zypper/src/repos.h Sat Aug 2 19:39:43 2008 @@ -150,7 +150,9 @@ void refresh_services(Zypper & zypper); -bool match_service(Zypper & zypper, std::string str, zypp::ServiceInfo * service); +bool match_service(Zypper & zypper, + std::string str, + zypp::repo::RepoInfoBase_Ptr & service_ptr); /** * Initialize rpm database on target, if not already initialized. Modified: trunk/zypper/src/utils/misc.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/utils/misc.h?rev=1073… ============================================================================== --- trunk/zypper/src/utils/misc.h (original) +++ trunk/zypper/src/utils/misc.h Sat Aug 2 19:39:43 2008 @@ -82,9 +82,10 @@ // comparator for Service set class ServiceAliasComparator { - public: bool operator()(const zypp::ServiceInfo & a, const zypp::ServiceInfo & b) + public: bool operator()(const zypp::repo::RepoInfoBase_Ptr & a, + const zypp::repo::RepoInfoBase_Ptr & b) { - return a.alias() < b.alias(); + return a->alias() < b->alias(); } }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0