Mailinglist Archive: zypp-commit (185 mails)
| < Previous | Next > |
[zypp-commit] r10766 - in /trunk/sat-solver/bindings: python/tests/repodata.py solvable.i
- From: kkaempf@xxxxxxxxxxxxxxxx
- Date: Wed, 06 Aug 2008 15:32:57 -0000
- Message-id: <20080806153257.2FB722A000@xxxxxxxxxxxxxxxx>
Author: kkaempf
Date: Wed Aug 6 17:32:56 2008
New Revision: 10766
URL: http://svn.opensuse.org/viewcvs/zypp?rev=10766&view=rev
Log:
support DIRSTRARRAY attributes
Modified:
trunk/sat-solver/bindings/python/tests/repodata.py
trunk/sat-solver/bindings/solvable.i
Modified: trunk/sat-solver/bindings/python/tests/repodata.py
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests/repodata.py?rev=10766&r1=10765&r2=10766&view=diff
==============================================================================
--- trunk/sat-solver/bindings/python/tests/repodata.py (original)
+++ trunk/sat-solver/bindings/python/tests/repodata.py Wed Aug 6 17:32:56 2008
@@ -12,7 +12,7 @@
class TestSequenceFunctions(unittest.TestCase):
- def test_repo_create(self):
+ def test_repodata(self):
pool = satsolver.Pool()
assert pool
pool.set_arch("x86_64")
Modified: trunk/sat-solver/bindings/solvable.i
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solvable.i?rev=10766&r1=10765&r2=10766&view=diff
==============================================================================
--- trunk/sat-solver/bindings/solvable.i (original)
+++ trunk/sat-solver/bindings/solvable.i Wed Aug 6 17:32:56 2008
@@ -97,7 +97,7 @@
xsolvable_attr_lookup_callback( void *cbdata, Solvable *s, Repodata *data,
Repokey *key, KeyValue *kv )
{
Swig_Type *result = (Swig_Type *)cbdata;
-
+
/*
* !! keep the order of case statements according to knownid.h !!
*/
@@ -132,8 +132,9 @@
*result = Swig_String( kv->str );
break;
case REPOKEY_TYPE_IDARRAY:
- if (Swig_Test(*result))
+ if (Swig_Test(*result)) {
*result = Swig_Array(); /* create new Array on first call */
+ }
if (data->localpool)
Swig_Append( *result, Swig_String( stringpool_id2str( &data->spool,
kv->id ) ) );
else
@@ -144,7 +145,11 @@
*result = Swig_Null; /*FIXME*/
break;
case REPOKEY_TYPE_DIRSTRARRAY:
- *result = Swig_Null; /*FIXME*/
+ if (Swig_Test(*result)) {
+ *result = Swig_Array(); /* create new Array on first call */
+ }
+ Swig_Append( *result, Swig_String( repodata_dir2str(data, kv->id,
kv->str) ) );
+ return kv->eof?1:0;
break;
case REPOKEY_TYPE_DIRNUMNUMARRAY:
*result = Swig_Null; /*FIXME*/
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx
Date: Wed Aug 6 17:32:56 2008
New Revision: 10766
URL: http://svn.opensuse.org/viewcvs/zypp?rev=10766&view=rev
Log:
support DIRSTRARRAY attributes
Modified:
trunk/sat-solver/bindings/python/tests/repodata.py
trunk/sat-solver/bindings/solvable.i
Modified: trunk/sat-solver/bindings/python/tests/repodata.py
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests/repodata.py?rev=10766&r1=10765&r2=10766&view=diff
==============================================================================
--- trunk/sat-solver/bindings/python/tests/repodata.py (original)
+++ trunk/sat-solver/bindings/python/tests/repodata.py Wed Aug 6 17:32:56 2008
@@ -12,7 +12,7 @@
class TestSequenceFunctions(unittest.TestCase):
- def test_repo_create(self):
+ def test_repodata(self):
pool = satsolver.Pool()
assert pool
pool.set_arch("x86_64")
Modified: trunk/sat-solver/bindings/solvable.i
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solvable.i?rev=10766&r1=10765&r2=10766&view=diff
==============================================================================
--- trunk/sat-solver/bindings/solvable.i (original)
+++ trunk/sat-solver/bindings/solvable.i Wed Aug 6 17:32:56 2008
@@ -97,7 +97,7 @@
xsolvable_attr_lookup_callback( void *cbdata, Solvable *s, Repodata *data,
Repokey *key, KeyValue *kv )
{
Swig_Type *result = (Swig_Type *)cbdata;
-
+
/*
* !! keep the order of case statements according to knownid.h !!
*/
@@ -132,8 +132,9 @@
*result = Swig_String( kv->str );
break;
case REPOKEY_TYPE_IDARRAY:
- if (Swig_Test(*result))
+ if (Swig_Test(*result)) {
*result = Swig_Array(); /* create new Array on first call */
+ }
if (data->localpool)
Swig_Append( *result, Swig_String( stringpool_id2str( &data->spool,
kv->id ) ) );
else
@@ -144,7 +145,11 @@
*result = Swig_Null; /*FIXME*/
break;
case REPOKEY_TYPE_DIRSTRARRAY:
- *result = Swig_Null; /*FIXME*/
+ if (Swig_Test(*result)) {
+ *result = Swig_Array(); /* create new Array on first call */
+ }
+ Swig_Append( *result, Swig_String( repodata_dir2str(data, kv->id,
kv->str) ) );
+ return kv->eof?1:0;
break;
case REPOKEY_TYPE_DIRNUMNUMARRAY:
*result = Swig_Null; /*FIXME*/
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx
| < Previous | Next > |