October 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11545 - in /trunk/sat-solver: package/ src/ tools/
by mlschroe＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: mlschroe Date: Thu Oct 30 11:49:56 2008 New Revision: 11545 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11545&view=rev Log: - adapt to coding style - log solver execution time - replace some fprintf calls with sat_debug Modified: trunk/sat-solver/package/libsatsolver.spec.in trunk/sat-solver/src/pool.c trunk/sat-solver/src/poolid.c trunk/sat-solver/src/repo.h trunk/sat-solver/src/repo_helix.c trunk/sat-solver/src/repo_solv.c trunk/sat-solver/src/repodata.h trunk/sat-solver/src/repopage.c trunk/sat-solver/src/solver.c trunk/sat-solver/src/strpool.c trunk/sat-solver/src/util.c trunk/sat-solver/src/util.h trunk/sat-solver/tools/repo_content.c trunk/sat-solver/tools/repo_deltainfoxml.c trunk/sat-solver/tools/repo_products.c trunk/sat-solver/tools/repo_susetags.c Modified: trunk/sat-solver/package/libsatsolver.spec.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.spec.in (original) +++ trunk/sat-solver/package/libsatsolver.spec.in Thu Oct 30 11:49:56 2008 @@ -144,6 +144,11 @@ #%doc swig/python/examples/*.py %{py_sitedir}/_satsolver.so %{py_sitedir}/satsolver.py +#see http://fedoraproject.org/wiki/Packaging/Python +%if 0%{?fedora_version} +%exclude %{py_sitedir}/satsolver.pyc +%exclude %{py_sitedir}/satsolver.pyo +%endif %files -n perl-satsolver %defattr(-,root,root,-) Modified: trunk/sat-solver/src/pool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=11545&… ============================================================================== --- trunk/sat-solver/src/pool.c (original) +++ trunk/sat-solver/src/pool.c Thu Oct 30 11:49:56 2008 @@ -261,7 +261,9 @@ Offset *whatprovides; Id *whatprovidesdata, *d; Repo *installed = pool->installed; + unsigned int now; + now = sat_timems(0); POOL_DEBUG(SAT_DEBUG_STATS, "number of solvables: %d\n", pool->nsolvables); POOL_DEBUG(SAT_DEBUG_STATS, "number of ids: %d + %d\n", pool->ss.nstrings, pool->nrels); @@ -354,6 +356,7 @@ pool->whatprovidesdataoff = off; pool->whatprovidesdataleft = extra; pool_shrink_whatprovides(pool); + POOL_DEBUG(SAT_DEBUG_STATS, "createwhatprovides took %d ms\n", sat_timems(now)); } /* Modified: trunk/sat-solver/src/poolid.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/poolid.c?rev=1154… ============================================================================== --- trunk/sat-solver/src/poolid.c (original) +++ trunk/sat-solver/src/poolid.c Thu Oct 30 11:49:56 2008 @@ -27,7 +27,7 @@ str2id(Pool *pool, const char *str, int create) { int oldnstrings = pool->ss.nstrings; - Id id = stringpool_str2id (&pool->ss, str, create); + Id id = stringpool_str2id(&pool->ss, str, create); if (create && pool->whatprovides && oldnstrings != pool->ss.nstrings && (id & WHATPROVIDES_BLOCK) == 0) { /* grow whatprovides array */ @@ -41,7 +41,7 @@ strn2id(Pool *pool, const char *str, unsigned int len, int create) { int oldnstrings = pool->ss.nstrings; - Id id = stringpool_strn2id (&pool->ss, str, len, create); + Id id = stringpool_strn2id(&pool->ss, str, len, create); if (create && pool->whatprovides && oldnstrings != pool->ss.nstrings && (id & WHATPROVIDES_BLOCK) == 0) { /* grow whatprovides array */ Modified: trunk/sat-solver/src/repo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo.h?rev=11545&… ============================================================================== --- trunk/sat-solver/src/repo.h (original) +++ trunk/sat-solver/src/repo.h Thu Oct 30 11:49:56 2008 @@ -17,17 +17,6 @@ #include "pool.h" #include "repodata.h" -typedef struct _Repokey { - Id name; - Id type; /* REPOKEY_TYPE_xxx */ - unsigned int size; - unsigned int storage; /* KEY_STORAGE_xxx */ -} Repokey; - -#define KEY_STORAGE_DROPPED 0 -#define KEY_STORAGE_SOLVABLE 1 -#define KEY_STORAGE_INCORE 2 -#define KEY_STORAGE_VERTICAL_OFFSET 3 typedef struct _Repo { @@ -197,31 +186,6 @@ int repo_lookup_void(Repo *repo, Id entry, Id keyid); const unsigned char *repo_lookup_bin_checksum(Repo *repo, Id entry, Id keyid, Id *typep); - -#if 0 -typedef struct _Dataiterator -{ - Repodata *data; - Id *keyp; - unsigned char *nextkeydp; - unsigned char *dp; - Repokey *key; - Repo *repo; - Id *idp; - const char *match; - Id solvid; - Id keyname; - unsigned flags; - unsigned state; - KeyValue kv; - regex_t regex; - int regex_err; - Id *subkeyp; - int subnum; - Id subschema; -} Dataiterator; -#else - typedef struct _Datamatcher { int flags; void *match; @@ -268,8 +232,6 @@ } Dataiterator; -#endif - int datamatcher_init(Datamatcher *ma, const char *match, int flags); void datamatcher_free(Datamatcher *ma); int datamatcher_match(Datamatcher *ma, const char *str); Modified: trunk/sat-solver/src/repo_helix.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo_helix.c?rev=… ============================================================================== --- trunk/sat-solver/src/repo_helix.c (original) +++ trunk/sat-solver/src/repo_helix.c Thu Oct 30 11:49:56 2008 @@ -860,7 +860,7 @@ l = fread(buf, 1, sizeof(buf), fp); if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR) { - fprintf(stderr, "%s at line %u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser)); + pool_debug(pool, SAT_FATAL, "%s at line %u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser)); exit(1); } if (l == 0) Modified: trunk/sat-solver/src/repo_solv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo_solv.c?rev=1… ============================================================================== --- trunk/sat-solver/src/repo_solv.c (original) +++ trunk/sat-solver/src/repo_solv.c Thu Oct 30 11:49:56 2008 @@ -955,10 +955,10 @@ schemadatap = read_idarray(&data, numid, 0, schemadatap, schemadataend); #if 0 Id *sp = schemadata + schemata[i]; - fprintf (stderr, "schema %d:", i); + fprintf(stderr, "schema %d:", i); for (; *sp; sp++) - fprintf (stderr, " %d", *sp); - fprintf (stderr, "\n"); + fprintf(stderr, " %d", *sp); + fprintf(stderr, "\n"); #endif } data.schemata = schemata; Modified: trunk/sat-solver/src/repodata.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repodata.h?rev=11… ============================================================================== --- trunk/sat-solver/src/repodata.h (original) +++ trunk/sat-solver/src/repodata.h Thu Oct 30 11:49:56 2008 @@ -25,9 +25,21 @@ #define SIZEOF_SHA256 32 struct _Repo; -struct _Repokey; struct _KeyValue; +typedef struct _Repokey { + Id name; + Id type; /* REPOKEY_TYPE_xxx */ + unsigned int size; + unsigned int storage; /* KEY_STORAGE_xxx */ +} Repokey; + +#define KEY_STORAGE_DROPPED 0 +#define KEY_STORAGE_SOLVABLE 1 +#define KEY_STORAGE_INCORE 2 +#define KEY_STORAGE_VERTICAL_OFFSET 3 + + typedef struct _Repodata { struct _Repo *repo; /* back pointer to repo */ @@ -45,8 +57,7 @@ FILE *fp; /* file pointer of solv file */ int error; /* corrupt solv file */ - - struct _Repokey *keys; /* keys, first entry is always zero */ + Repokey *keys; /* keys, first entry is always zero */ unsigned int nkeys; /* length of keys array */ unsigned char keybits[32]; /* keyname hash */ @@ -61,33 +72,33 @@ Dirpool dirpool; /* local dir pool */ - Id mainschema; - Id *mainschemaoffsets; - - unsigned char *incoredata; /* in-core data (flat_attrs) */ - unsigned int incoredatalen; /* data len (attr_next_free) */ + unsigned char *incoredata; /* in-core data */ + unsigned int incoredatalen; /* in-core data used */ unsigned int incoredatafree; /* free data len */ - Id *incoreoffset; /* offset for all entries (ent2attr) */ + Id mainschema; /* SOLVID_META schema */ + Id *mainschemaoffsets; /* SOLVID_META offsets into incoredata */ + + Id *incoreoffset; /* offset for all entries */ Id *verticaloffset; /* offset for all verticals, nkeys elements */ Id lastverticaloffset; /* end of verticals */ Repopagestore store; /* our page store */ - unsigned char *vincore; - unsigned int vincorelen; + unsigned char *vincore; /* internal vertical data */ + unsigned int vincorelen; /* data size */ Id **attrs; /* un-internalized attributes */ Id **xattrs; /* anonymous handles */ - int nxattrs; + int nxattrs; /* number of handles */ unsigned char *attrdata; /* their string data space */ - unsigned int attrdatalen; + unsigned int attrdatalen; /* its len */ Id *attriddata; /* their id space */ - unsigned int attriddatalen; + unsigned int attriddatalen; /* its len */ - /* array cache */ + /* array cache to speed up repodata_add functions*/ Id lasthandle; Id lastkey; Id lastdatalen; @@ -98,20 +109,40 @@ #define SOLVID_POS -2 #define SOLVID_SUBSCHEMA -3 /* internal! */ + /*----- * management functions */ void repodata_init(Repodata *data, struct _Repo *repo, int localpool); -void repodata_extend(Repodata *data, Id p); -void repodata_extend_block(Repodata *data, Id p, int num); void repodata_free(Repodata *data); -/* internalize repodata into .solv, required before writing out a .solv file */ -void repodata_internalize(Repodata *data); -Id repodata_key2id(Repodata *data, struct _Repokey *key, int create); +/* + * key management functions + */ +Id repodata_key2id(Repodata *data, Repokey *key, int create); +static inline Repokey * +repodata_id2key(Repodata *data, Id keyid) +{ + return data->keys + keyid; +} + +/* + * schema management functions + */ Id repodata_schema2id(Repodata *data, Id *schema, int create); +static inline Id * +repodata_id2schema(Repodata *data, Id schemaid) +{ + return data->schemadata + data->schemata[schemaid]; +} + +/* + * data search and access + */ +/* check if there is a chance that the repodata contains data for + * the specified keyname */ static inline int repodata_precheck_keyname(Repodata *data, Id keyname) { @@ -119,15 +150,13 @@ return x && (x & (1 << (keyname & 7))) ? 1 : 0; } -/*---- - * access functions - */ - -/* Search key <keyname> (all keys, if keyname == 0) for Id <solvid> - * Call <callback> for each match - */ -void repodata_search(Repodata *data, Id solvid, Id keyname, int flags, int (*callback)(void *cbdata, Solvable *s, Repodata *data, struct _Repokey *key, struct _KeyValue *kv), void *cbdata); -int repodata_stringify(Pool *pool, Repodata *data, struct _Repokey *key, struct _KeyValue *kv, int flags); +/* search key <keyname> (all keys, if keyname == 0) for Id <solvid> + * Call <callback> for each match */ +void repodata_search(Repodata *data, Id solvid, Id keyname, int flags, int (*callback)(void *cbdata, Solvable *s, Repodata *data, Repokey *key, struct _KeyValue *kv), void *cbdata); + +/* Make sure the found KeyValue has the "str" field set. Return false + * if not possible */ +int repodata_stringify(Pool *pool, Repodata *data, Repokey *key, struct _KeyValue *kv, int flags); /* lookup functions */ @@ -138,23 +167,32 @@ const unsigned char *repodata_lookup_bin_checksum(Repodata *data, Id solvid, Id keyname, Id *typep); + /*----- * data assignment functions */ +/* + * extend the data so that it contains the specified solvables + * (no longer needed, as the repodata_set functions autoextend) + */ +void repodata_extend(Repodata *data, Id p); +void repodata_extend_block(Repodata *data, Id p, int num); + +/* internalize freshly set data, so that it is found by the search + * functions and written out */ +void repodata_internalize(Repodata *data); + /* create an anonymous handle. useful for substructures like * fixarray/flexarray */ Id repodata_new_handle(Repodata *data); /* basic types: void, num, string, Id */ - void repodata_set_void(Repodata *data, Id solvid, Id keyname); void repodata_set_num(Repodata *data, Id solvid, Id keyname, unsigned int num); -void repodata_set_str(Repodata *data, Id solvid, Id keyname, const char *str); void repodata_set_id(Repodata *data, Id solvid, Id keyname, Id id); - -/* */ - +void repodata_set_str(Repodata *data, Id solvid, Id keyname, const char *str); +/* create id from string, then set_id */ void repodata_set_poolstr(Repodata *data, Id solvid, Id keyname, const char *str); /* set numeric constant */ @@ -180,18 +218,15 @@ void repodata_add_fixarray(Repodata *data, Id solvid, Id keyname, Id ghandle); void repodata_add_flexarray(Repodata *data, Id solvid, Id keyname, Id ghandle); - -/*----- - * data management - */ - /* - merge attributes fro one solvable to another + merge attributes from one solvable to another works only if the data is not yet internalized */ -void repodata_merge_attrs (Repodata *data, Id dest, Id src); +void repodata_merge_attrs(Repodata *data, Id dest, Id src); -/* */ +/* + * load all paged data, used to speed up copying in repo_rpmdb + */ void repodata_disable_paging(Repodata *data); /* helper functions */ Modified: trunk/sat-solver/src/repopage.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repopage.c?rev=11… ============================================================================== --- trunk/sat-solver/src/repopage.c (original) +++ trunk/sat-solver/src/repopage.c Thu Oct 30 11:49:56 2008 @@ -88,8 +88,8 @@ #define HS (65536) Ref htab[HS]; Ref hnext[BLOCK_SIZE]; - memset (htab, -1, sizeof (htab)); - memset (hnext, -1, sizeof (hnext)); + memset(htab, -1, sizeof (htab)); + memset(hnext, -1, sizeof (hnext)); unsigned int litofs = 0; while (io + 2 < in_len) { @@ -118,8 +118,8 @@ } for (; try != -1 && tries < 12; tries++) { - //assert (mlen >= 2); - //assert (io + mlen < in_len); + //assert(mlen >= 2); + //assert(io + mlen < in_len); /* Try a match starting from [io] with the strings at [try]. That's only sensible if TRY actually is before IO (can happen with uninit hash table). If we have a previous match already @@ -128,7 +128,7 @@ if (try < io && in[try + mlen] == in[io + mlen]) { unsigned int this_len, this_ofs; - if (memcmp (in + try, in + io, mlen)) + if (memcmp(in + try, in + io, mlen)) goto no_match; this_len = mlen + 1; /* Now try extending the match by more characters. */ @@ -139,15 +139,15 @@ #if 0 unsigned int testi; for (testi = 0; testi < this_len; testi++) - assert (in[try + testi] == in[io + testi]); + assert(in[try + testi] == in[io + testi]); #endif this_ofs = (io - try) - 1; /*if (this_ofs > 65535) goto no_match; */ #if 0 - assert (this_len >= 2); - assert (this_len >= mlen); - assert (this_len > mlen || (this_len == mlen && this_ofs > mofs)); + assert(this_len >= 2); + assert(this_len >= mlen); + assert(this_len > mlen || (this_len == mlen && this_ofs > mofs)); #endif mlen = this_len, mofs = this_ofs; /* If our match extends up to the end of input, no next @@ -166,7 +166,7 @@ match_done: if (mlen) { - //fprintf (stderr, "%d %d\n", mlen, mofs); + /*fprintf(stderr, "%d %d\n", mlen, mofs);*/ if (mlen == 2 && (litofs || mofs >= 1024)) mlen = 0; /*else if (mofs >= 65536) @@ -223,7 +223,7 @@ { litofs--; unsigned litlen = io - litofs; - //fprintf (stderr, "lit: %d\n", litlen); + //fprintf(stderr, "lit: %d\n", litlen); while (litlen) { unsigned int easy_sz; @@ -239,7 +239,7 @@ { if (oo + easy_sz >= out_len) return 0; - memcpy (out + oo, in + litofs, easy_sz); + memcpy(out + oo, in + litofs, easy_sz); litofs += easy_sz; oo += easy_sz; litlen -= easy_sz; @@ -261,7 +261,7 @@ if (oo + 1 + 32 >= out_len) return 0; out[oo++] = 0x80 | 31; - memcpy (out + oo, in + litofs, 32); + memcpy(out + oo, in + litofs, 32); oo += 32; litofs += 32; litlen -= 32; @@ -270,7 +270,7 @@ litofs = 0; } - //fprintf (stderr, "ref: %d @ %d\n", mlen, mofs); + //fprintf(stderr, "ref: %d @ %d\n", mlen, mofs); if (mlen >= 2 && mlen <= 9 && mofs < 1024) { @@ -288,7 +288,7 @@ } else if (mofs >= 65536) { - assert (mlen >= 5 && mlen < 2048 + 5); + assert(mlen >= 5 && mlen < 2048 + 5); if (oo + 5 >= out_len) return 0; out[oo++] = 0xf8 | ((mlen - 5) >> 8); @@ -299,7 +299,7 @@ } else if (mlen >= 3 && mlen <= 18) { - assert (mofs < 65536); + assert(mofs < 65536); if (oo + 3 >= out_len) return 0; out[oo++] = 0xe0 | (mlen - 3); @@ -308,7 +308,7 @@ } else { - assert (mlen >= 19 && mlen <= 4095 + 19 && mofs < 65536); + assert(mlen >= 19 && mlen <= 4095 + 19 && mofs < 65536); if (oo + 4 >= out_len) return 0; out[oo++] = 0xf0 | ((mlen - 19) >> 8); @@ -346,7 +346,7 @@ { litofs--; unsigned litlen = io - litofs; - //fprintf (stderr, "lit: %d\n", litlen); + //fprintf(stderr, "lit: %d\n", litlen); while (litlen) { unsigned int easy_sz; @@ -361,7 +361,7 @@ { if (oo + easy_sz >= out_len) return 0; - memcpy (out + oo, in + litofs, easy_sz); + memcpy(out + oo, in + litofs, easy_sz); litofs += easy_sz; oo += easy_sz; litlen -= easy_sz; @@ -383,7 +383,7 @@ if (oo + 1 + 32 >= out_len) return 0; out[oo++] = 0x80 | 31; - memcpy (out + oo, in + litofs, 32); + memcpy(out + oo, in + litofs, 32); oo += 32; litofs += 32; litlen -= 32; @@ -476,7 +476,7 @@ break; } } - //fprintf (stderr, "ref: %d @ %d\n", first, o); + //fprintf(stderr, "ref: %d @ %d\n", first, o); o++; o = -o; #if 0 @@ -591,10 +591,10 @@ if (store->ncanmap < 4) store->ncanmap = 4; store->mapped = sat_realloc2(store->mapped, store->ncanmap, sizeof(store->mapped[0])); - memset (store->mapped + oldcan, 0, (store->ncanmap - oldcan) * sizeof (store->mapped[0])); + memset(store->mapped + oldcan, 0, (store->ncanmap - oldcan) * sizeof (store->mapped[0])); store->blob_store = sat_realloc2(store->blob_store, store->ncanmap, BLOB_PAGESIZE); #ifdef DEBUG_PAGING - fprintf (stderr, "PAGE: can map %d pages\n", store->ncanmap); + fprintf(stderr, "PAGE: can map %d pages\n", store->ncanmap); #endif } @@ -612,7 +612,7 @@ { pnum--; Attrblobpage *p = store->pages + pnum; - assert (p->mapped_at != -1); + assert(p->mapped_at != -1); if (pnum >= pstart && pnum <= pend) cost[i] = 1; else @@ -658,7 +658,7 @@ { /* Evict this page. */ #ifdef DEBUG_PAGING - fprintf (stderr, "PAGE: evict page %d from %d\n", pnum, i); + fprintf(stderr, "PAGE: evict page %d from %d\n", pnum, i); #endif cost[i] = 0; store->mapped[i] = 0; @@ -677,10 +677,10 @@ if (p->mapped_at != pnum * BLOB_PAGESIZE) { #ifdef DEBUG_PAGING - fprintf (stderr, "PAGECOPY: %d to %d\n", i, pnum); + fprintf(stderr, "PAGECOPY: %d to %d\n", i, pnum); #endif /* Still mapped somewhere else, so just copy it from there. */ - memcpy (dest, store->blob_store + p->mapped_at, BLOB_PAGESIZE); + memcpy(dest, store->blob_store + p->mapped_at, BLOB_PAGESIZE); store->mapped[p->mapped_at / BLOB_PAGESIZE] = 0; } } @@ -690,11 +690,11 @@ unsigned int compressed = in_len & 1; in_len >>= 1; #ifdef DEBUG_PAGING - fprintf (stderr, "PAGEIN: %d to %d", i, pnum); + fprintf(stderr, "PAGEIN: %d to %d", i, pnum); #endif if (pread(store->pagefd, compressed ? buf : dest, in_len, p->file_offset) != in_len) { - perror ("mapping pread"); + perror("mapping pread"); return 0; } if (compressed) @@ -710,11 +710,11 @@ return 0; } #ifdef DEBUG_PAGING - fprintf (stderr, " (expand %d to %d)", in_len, out_len); + fprintf(stderr, " (expand %d to %d)", in_len, out_len); #endif } #ifdef DEBUG_PAGING - fprintf (stderr, "\n"); + fprintf(stderr, "\n"); #endif } p->mapped_at = pnum * BLOB_PAGESIZE; @@ -775,7 +775,7 @@ can_seek = 0; #ifdef DEBUG_PAGING - fprintf (stderr, "can %sseek\n", can_seek ? "" : "NOT "); + fprintf(stderr, "can %sseek\n", can_seek ? "" : "NOT "); #endif npages = (blobsz + BLOB_PAGESIZE - 1) / BLOB_PAGESIZE; @@ -792,7 +792,7 @@ Attrblobpage *p = store->pages + i; in_len >>= 1; #ifdef DEBUG_PAGING - fprintf (stderr, "page %d: len %d (%scompressed)\n", + fprintf(stderr, "page %d: len %d (%scompressed)\n", i, in_len, compressed ? "" : "not "); #endif if (can_seek) @@ -847,7 +847,7 @@ #ifdef STANDALONE static void -transfer_file (FILE * from, FILE * to, int compress) +transfer_file(FILE * from, FILE * to, int compress) { unsigned char inb[BLOCK_SIZE]; unsigned char outb[BLOCK_SIZE]; @@ -856,45 +856,45 @@ unsigned int in_len, out_len; if (compress) { - in_len = fread (inb, 1, BLOCK_SIZE, from); + in_len = fread(inb, 1, BLOCK_SIZE, from); if (in_len) { unsigned char *b = outb; - out_len = compress_buf (inb, in_len, outb, sizeof (outb)); + out_len = compress_buf(inb, in_len, outb, sizeof (outb)); if (!out_len) b = inb, out_len = in_len; - if (fwrite (&out_len, sizeof (out_len), 1, to) != 1) + if (fwrite(&out_len, sizeof (out_len), 1, to) != 1) { - perror ("write size"); + perror("write size"); exit (1); } - if (fwrite (b, out_len, 1, to) != 1) + if (fwrite(b, out_len, 1, to) != 1) { - perror ("write data"); + perror("write data"); exit (1); } } } else { - if (fread (&in_len, sizeof (in_len), 1, from) != 1) + if (fread(&in_len, sizeof(in_len), 1, from) != 1) { - if (feof (from)) + if (feof(from)) return; - perror ("can't read size"); - exit (1); + perror("can't read size"); + exit(1); } - if (fread (inb, in_len, 1, from) != 1) + if (fread(inb, in_len, 1, from) != 1) { - perror ("can't read data"); - exit (1); + perror("can't read data"); + exit(1); } out_len = - unchecked_decompress_buf (inb, in_len, outb, sizeof (outb)); - if (fwrite (outb, out_len, 1, to) != 1) + unchecked_decompress_buf(inb, in_len, outb, sizeof(outb)); + if (fwrite(outb, out_len, 1, to) != 1) { - perror ("can't write output"); - exit (1); + perror("can't write output"); + exit(1); } } } @@ -902,7 +902,7 @@ /* Just for benchmarking purposes. */ static void -dumb_memcpy (void *dest, const void *src, unsigned int len) +dumb_memcpy(void *dest, const void *src, unsigned int len) { char *d = dest; const char *s = src; @@ -911,16 +911,16 @@ } static void -benchmark (FILE * from) +benchmark(FILE * from) { unsigned char inb[BLOCK_SIZE]; unsigned char outb[BLOCK_SIZE]; - unsigned int in_len = fread (inb, 1, BLOCK_SIZE, from); + unsigned int in_len = fread(inb, 1, BLOCK_SIZE, from); unsigned int out_len; if (!in_len) { - perror ("can't read from input"); - exit (1); + perror("can't read from input"); + exit(1); } unsigned int calib_loop; @@ -932,71 +932,71 @@ #if 0 calib_loop = 1; per_loop = 0; - start = clock (); - while ((clock () - start) < CLOCKS_PER_SEC / 4) + start = clock(); + while ((clock() - start) < CLOCKS_PER_SEC / 4) { calib_loop *= 2; for (i = 0; i < calib_loop; i++) - dumb_memcpy (outb, inb, in_len); + dumb_memcpy(outb, inb, in_len); per_loop += calib_loop; } - fprintf (stderr, "memcpy:\nCalibrated to %d iterations per loop\n", + fprintf(stderr, "memcpy:\nCalibrated to %d iterations per loop\n", per_loop); - start = clock (); + start = clock(); for (i = 0; i < 10; i++) for (j = 0; j < per_loop; j++) - dumb_memcpy (outb, inb, in_len); - end = clock (); + dumb_memcpy(outb, inb, in_len); + end = clock(); seconds = (end - start) / (float) CLOCKS_PER_SEC; - fprintf (stderr, "%.2f seconds == %.2f MB/s\n", seconds, + fprintf(stderr, "%.2f seconds == %.2f MB/s\n", seconds, ((long long) in_len * per_loop * 10) / (1024 * 1024 * seconds)); #endif calib_loop = 1; per_loop = 0; - start = clock (); - while ((clock () - start) < CLOCKS_PER_SEC / 4) + start = clock(); + while ((clock() - start) < CLOCKS_PER_SEC / 4) { calib_loop *= 2; for (i = 0; i < calib_loop; i++) - compress_buf(inb, in_len, outb, sizeof (outb)); + compress_buf(inb, in_len, outb, sizeof(outb)); per_loop += calib_loop; } fprintf(stderr, "compression:\nCalibrated to %d iterations per loop\n", per_loop); - start = clock (); + start = clock(); for (i = 0; i < 10; i++) for (j = 0; j < per_loop; j++) - compress_buf (inb, in_len, outb, sizeof (outb)); - end = clock (); + compress_buf(inb, in_len, outb, sizeof(outb)); + end = clock(); seconds = (end - start) / (float) CLOCKS_PER_SEC; fprintf(stderr, "%.2f seconds == %.2f MB/s\n", seconds, ((long long) in_len * per_loop * 10) / (1024 * 1024 * seconds)); - out_len = compress_buf(inb, in_len, outb, sizeof (outb)); + out_len = compress_buf(inb, in_len, outb, sizeof(outb)); calib_loop = 1; per_loop = 0; - start = clock (); - while ((clock () - start) < CLOCKS_PER_SEC / 4) + start = clock(); + while ((clock() - start) < CLOCKS_PER_SEC / 4) { calib_loop *= 2; for (i = 0; i < calib_loop; i++) - unchecked_decompress_buf(outb, out_len, inb, sizeof (inb)); + unchecked_decompress_buf(outb, out_len, inb, sizeof(inb)); per_loop += calib_loop; } fprintf(stderr, "decompression:\nCalibrated to %d iterations per loop\n", per_loop); - start = clock (); + start = clock(); for (i = 0; i < 10; i++) for (j = 0; j < per_loop; j++) - unchecked_decompress_buf(outb, out_len, inb, sizeof (inb)); + unchecked_decompress_buf(outb, out_len, inb, sizeof(inb)); end = clock(); seconds = (end - start) / (float) CLOCKS_PER_SEC; fprintf(stderr, "%.2f seconds == %.2f MB/s\n", seconds, @@ -1004,15 +1004,15 @@ } int -main (int argc, char *argv[]) +main(int argc, char *argv[]) { int compress = 1; - if (argc > 1 && !strcmp (argv[1], "-d")) + if (argc > 1 && !strcmp(argv[1], "-d")) compress = 0; - if (argc > 1 && !strcmp (argv[1], "-b")) - benchmark (stdin); + if (argc > 1 && !strcmp(argv[1], "-b")) + benchmark(stdin); else - transfer_file (stdin, stdout, compress); + transfer_file(stdin, stdout, compress); return 0; } Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=1154… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Thu Oct 30 11:49:56 2008 @@ -3149,9 +3149,11 @@ Id *problem; Id why; int i, j, nsol; + unsigned int now, refnow; if (!solv->problems.count) return; + now = sat_timems(0); problems_sort(solv); queue_clone(&problems, &solv->problems); queue_init(&solution); @@ -3159,6 +3161,7 @@ /* copy over proof index */ queue_push(&solutions, problems.elements[0]); problem = problems.elements + 1; + refnow = sat_timems(0); for (i = 1; i < problems.count; i++) { Id v = problems.elements[i]; @@ -3167,12 +3170,14 @@ /* mark end of this problem */ queue_push(&solutions, 0); queue_push(&solutions, 0); + POOL_DEBUG(SAT_DEBUG_STATS, "refining took %d ms\n", sat_timems(refnow)); if (i + 1 == problems.count) break; /* copy over proof of next problem */ queue_push(&solutions, problems.elements[i + 1]); i++; problem = problems.elements + i + 1; + refnow = sat_timems(0); continue; } refine_suggestion(solv, job, problem, v, &solution); @@ -3261,6 +3266,7 @@ assert(solv->problems.count == solutions.count); queue_free(&solutions); + POOL_DEBUG(SAT_DEBUG_STATS, "problems_to_solutions took %d ms\n", sat_timems(now)); } @@ -3922,7 +3928,9 @@ Solvable *s; int goterase; Rule *r; + int now, solve_start; + solve_start = sat_timems(0); POOL_DEBUG(SAT_DEBUG_STATS, "solver started\n"); POOL_DEBUG(SAT_DEBUG_STATS, "fixsystem=%d updatesystem=%d dosplitprovides=%d, noupdateprovide=%d\n", solv->fixsystem, solv->updatesystem, solv->dosplitprovides, solv->noupdateprovide); POOL_DEBUG(SAT_DEBUG_STATS, "distupgrade=%d distupgrade_removeunsupported=%d\n", solv->distupgrade, solv->distupgrade_removeunsupported); @@ -3969,6 +3977,7 @@ queue_push(&solv->decisionq_why, 0); solv->decisionmap[SYSTEMSOLVABLE] = 1; /* installed at level '1' */ + now = sat_timems(0); /* * create rules for all package that could be involved with the solving * so called: rpm rules @@ -4056,6 +4065,7 @@ solv->directdecisions = solv->decisionq.count; POOL_DEBUG(SAT_DEBUG_STATS, "decisions so far: %d\n", solv->decisionq.count); + POOL_DEBUG(SAT_DEBUG_STATS, "rpm rule creation took %d ms\n", sat_timems(now)); /* * create feature rules @@ -4341,7 +4351,9 @@ * ******************************************** */ + now = sat_timems(0); run_solver(solv, 1, solv->dontinstallrecommended ? 0 : 1); + POOL_DEBUG(SAT_DEBUG_STATS, "solver took %d ms\n", sat_timems(now)); queue_init(&redoq); goterase = 0; @@ -4527,8 +4539,9 @@ solv->recommendations.count = recocount; } - POOL_DEBUG(SAT_DEBUG_STATS, "final solver statistics: %d learned rules, %d unsolvable\n", solv->stats_learned, solv->stats_unsolvable); queue_free(&redoq); + POOL_DEBUG(SAT_DEBUG_STATS, "final solver statistics: %d learned rules, %d unsolvable\n", solv->stats_learned, solv->stats_unsolvable); + POOL_DEBUG(SAT_DEBUG_STATS, "solver_solve took %d ms\n", sat_timems(solve_start)); } /***********************************************************************/ Modified: trunk/sat-solver/src/strpool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/strpool.c?rev=115… ============================================================================== --- trunk/sat-solver/src/strpool.c (original) +++ trunk/sat-solver/src/strpool.c Thu Oct 30 11:49:56 2008 @@ -70,7 +70,7 @@ } Id -stringpool_strn2id (Stringpool *ss, const char *str, unsigned len, int create) +stringpool_strn2id(Stringpool *ss, const char *str, unsigned len, int create) { Hashval h; unsigned int hh; @@ -148,18 +148,18 @@ } Id -stringpool_str2id (Stringpool *ss, const char *str, int create) +stringpool_str2id(Stringpool *ss, const char *str, int create) { - if ( !str ) + if (!str) return STRID_NULL; - if ( !*str ) + if (!*str) return STRID_EMPTY; - unsigned len = strlen (str); - return stringpool_strn2id (ss, str, len, create); + unsigned len = strlen(str); + return stringpool_strn2id(ss, str, len, create); } void -stringpool_shrink (Stringpool *ss) +stringpool_shrink(Stringpool *ss) { ss->stringspace = sat_extend_resize(ss->stringspace, ss->sstrings, 1, STRINGSPACE_BLOCK); ss->strings = sat_extend_resize(ss->strings, ss->nstrings, sizeof(Offset), STRING_BLOCK); Modified: trunk/sat-solver/src/util.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/util.c?rev=11545&… ============================================================================== --- trunk/sat-solver/src/util.c (original) +++ trunk/sat-solver/src/util.c Thu Oct 30 11:49:56 2008 @@ -9,6 +9,7 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> +#include <sys/time.h> #include "util.h" @@ -81,3 +82,17 @@ return 0; } +unsigned int +sat_timems(unsigned int subtract) +{ + struct timeval tv; + unsigned int r; + + if (gettimeofday(&tv, 0)) + return 0; + r = (((unsigned int)tv.tv_sec >> 16) * 1000) << 16; + r += ((unsigned int)tv.tv_sec & 0xffff) * 1000; + r += (unsigned int)tv.tv_usec / 1000; + return r - subtract; +} + Modified: trunk/sat-solver/src/util.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/util.h?rev=11545&… ============================================================================== --- trunk/sat-solver/src/util.h (original) +++ trunk/sat-solver/src/util.h Thu Oct 30 11:49:56 2008 @@ -27,6 +27,7 @@ extern void *sat_realloc2(void *, size_t, size_t); extern void *sat_free(void *); extern void sat_oom(size_t, size_t); +extern unsigned int sat_timems(unsigned int subtract); static inline void *sat_extend(void *buf, size_t len, size_t nmemb, size_t size, size_t block) { 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 Thu Oct 30 11:49:56 2008 @@ -142,7 +142,7 @@ if (!rel || !evr) { - fprintf(stderr, "repo_content: bad relation '%s %s'\n", name, rel); + pool_debug(pool, SAT_FATAL, "repo_content: bad relation '%s %s'\n", name, rel); exit(1); } for (flags = 0; flags < 6; flags++) @@ -150,7 +150,7 @@ break; if (flags == 6) { - fprintf(stderr, "repo_content: Unknown relation '%s'\n", rel); + pool_debug(pool, SAT_FATAL, "repo_content: unknown relation '%s'\n", rel); exit(1); } id = rel2id(pool, id, str2id(pool, evr, 1), flags + 1, 1); @@ -367,7 +367,7 @@ else if (code10 && istag ("CONTENTSTYLE")) /* CONTENTSTYLE must be first line */ - fprintf(stderr, "repo_content: 'CONTENTSTYLE' must be first line of 'content'\n"); + pool_debug(pool, SAT_ERROR, "repo_content: 'CONTENTSTYLE' must be first line of 'content'\n"); else if (code10 && istag ("DISTPRODUCT")) /* DISTPRODUCT is for registration and Yast, not for the solver. */ repo_set_str(repo, s - pool->solvables, PRODUCT_DISTPRODUCT, value); @@ -407,12 +407,12 @@ #undef istag } else - fprintf (stderr, "repo_content: malformed line: %s\n", line); + pool_debug(pool, SAT_ERROR, "repo_content: malformed line: %s\n", line); } if (!s || !s->name) { - fprintf(stderr, "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); } Modified: trunk/sat-solver/tools/repo_deltainfoxml.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_deltainfox… ============================================================================== --- trunk/sat-solver/tools/repo_deltainfoxml.c (original) +++ trunk/sat-solver/tools/repo_deltainfoxml.c Thu Oct 30 11:49:56 2008 @@ -285,7 +285,7 @@ const char *str; #if 0 - fprintf(stderr, "start: [%d]%s\n", pd->state, name); + fprintf(stderr, "start: [%d]%s\n", pd->state, name); #endif if (pd->depth != pd->statedepth) { @@ -301,7 +301,7 @@ break; if (sw->from != pd->state) { -#if 1 +#if 0 fprintf(stderr, "into unknown: [%d]%s (from: %d)\n", sw->to, name, sw->from); exit( 1 ); #endif @@ -355,7 +355,7 @@ else if (!strcasecmp(str, "md5")) pd->delta.filechecksumtype = REPOKEY_TYPE_MD5; else - fprintf(stderr, "warning: unknown checksum type: '%s'\n", str); + pool_debug(pool, SAT_ERROR, "unknown checksum type: '%s'\n", str); } case STATE_SEQUENCE: break; @@ -373,12 +373,12 @@ const char *str; #if 0 - fprintf(stderr, "end: %s\n", name); + fprintf(stderr, "end: %s\n", name); #endif if (pd->depth != pd->statedepth) { pd->depth--; -#if 1 +#if 0 fprintf(stderr, "back from unknown %d %d %d\n", pd->state, pd->depth, pd->statedepth); #endif return; @@ -585,7 +585,7 @@ l = fread(buf, 1, sizeof(buf), fp); if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR) { - fprintf(stderr, "repo_updateinfoxml: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser)); + pool_debug(pool, SAT_FATAL, "repo_updateinfoxml: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser)); exit(1); } if (l == 0) Modified: trunk/sat-solver/tools/repo_products.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_products.c… ============================================================================== --- trunk/sat-solver/tools/repo_products.c (original) +++ trunk/sat-solver/tools/repo_products.c Thu Oct 30 11:49:56 2008 @@ -271,7 +271,7 @@ if (pd->ctime) repodata_set_num(pd->data, pd->handle, SOLVABLE_INSTALLTIME, pd->ctime); - if ( pd->basename ) + if (pd->basename) repodata_set_str(pd->data, pd->handle, PRODUCT_REFERENCEFILE, pd->basename); /* this is where <productsdir>/baseproduct points to */ @@ -660,7 +660,6 @@ sat_free(pd.content); join_freemem(); - if (!(flags & REPO_NO_INTERNALIZE)) repodata_internalize(data); } 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 Thu Oct 30 11:49:56 2008 @@ -77,7 +77,7 @@ i = split(line + 5, sp, 4); /* name, <op>, evr, ? */ if (i != 1 && i != 3) /* expect either 'name' or 'name' <op> 'evr' */ { - fprintf(stderr, "Bad dependency line: %d: %s\n", pd->lineno, line); + pool_debug(pool, SAT_FATAL, "susetags: bad dependency line: %d: %s\n", pd->lineno, line); exit(1); } if (kind) @@ -92,7 +92,7 @@ break; if (flags == 6) { - fprintf(stderr, "Unknown relation %d: '%s'\n", pd->lineno, sp[1]); + pool_debug(pool, SAT_FATAL, "susetags: unknown relation in %d: '%s'\n", pd->lineno, sp[1]); exit(1); } id = rel2id(pool, id, evrid, flags + 1, 1); @@ -117,7 +117,7 @@ i = split(line, sp, 3); if (i != 2 && i != 3) { - fprintf(stderr, "Bad location line: %d: %s\n", pd->lineno, line); + pool_debug(pool, SAT_FATAL, "susetags: bad location line: %d: %s\n", pd->lineno, line); exit(1); } /* If we have a dirname, let's see if it's the same as arch. In that @@ -187,7 +187,7 @@ if (split(line, sp, 5) != 4) { - fprintf(stderr, "Bad source line: %d: %s\n", pd->lineno, line); + pool_debug(pool, SAT_FATAL, "susetags: bad source line: %d: %s\n", pd->lineno, line); exit(1); } @@ -244,7 +244,7 @@ Id type; if (split(line, sp, 3) != 2) { - fprintf(stderr, "Bad source line: %d: %s\n", pd->lineno, line); + pool_debug(pd->repo->pool, SAT_FATAL, "susetags: bad checksum line: %d: %s\n", pd->lineno, line); exit(1); } if (!strcasecmp (sp[0], "sha1")) @@ -253,12 +253,12 @@ l = SIZEOF_MD5 * 2, type = REPOKEY_TYPE_MD5; else { - fprintf(stderr, "Unknown checksum type: %d: %s\n", pd->lineno, sp[0]); + pool_debug(pd->repo->pool, SAT_FATAL, "susetags: unknown checksum type: %d: %s\n", pd->lineno, sp[0]); exit(1); } if (strlen(sp[1]) != l) { - fprintf(stderr, "Invalid checksum length: %d: for %s: %s\n", pd->lineno, sp[0], sp[1]); + pool_debug(pd->repo->pool, SAT_FATAL, "susetags: bad checksum length: %d: for %s: %s\n", pd->lineno, sp[0], sp[1]); exit(1); } repodata_set_checksum(data, handle, keyname, type, sp[1]); @@ -559,7 +559,7 @@ if (is_end && strncmp(linep - 1 - intag, line + 1, intag)) { - fprintf(stderr, "Nonmatching multi-line tags: %d: '%s' '%s' %d\n", pd.lineno, linep - 1 - intag, line + 1, intag); + pool_debug(pool, SAT_ERROR, "susetags: Nonmatching multi-line tags: %d: '%s' '%s' %d\n", pd.lineno, linep - 1 - intag, line + 1, intag); } if (cummulate && !is_end) { @@ -591,7 +591,7 @@ char *tagend = strchr(line, ':'); if (!tagend) { - fprintf(stderr, "bad line: %d: %s\n", pd.lineno, line); + pool_debug(pool, SAT_FATAL, "susetags: bad line: %d: %s\n", pd.lineno, line); exit(1); } intag = tagend - (line + 1); @@ -666,7 +666,7 @@ if (split(line + 5, sp, 5) != 4) { - fprintf(stderr, "Bad line: %d: %s\n", pd.lineno, line); + pool_debug(pool, SAT_FATAL, "susetags: bad line: %d: %s\n", pd.lineno, line); exit(1); } /* Lookup (but don't construct) the name and arch. */ @@ -964,7 +964,7 @@ break; default: - fprintf(stderr,"unknown line %s\n", line); + pool_debug(pool, SAT_ERROR, "susetags: unknown line: %d: %s\n", pd.lineno, line); break; } @@ -985,7 +985,7 @@ { if (split(pd.share_with[i], sp, 5) != 4) { - fprintf(stderr, "Bad =Shr line: %s\n", pd.share_with[i]); + pool_debug(pool, SAT_FATAL, "susetags: bad =Shr line: %s\n", pd.share_with[i]); exit(1); } -- 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] r11544 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: jkupec Date: Thu Oct 30 10:27:39 2008 New Revision: 11544 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11544&view=rev Log: - changes Modified: trunk/zypper/package/zypper.changes 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 Thu Oct 30 10:27:39 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 30 10:25:16 CET 2008 - jkupec(a)suse.cz + +- fixed pager process (for viewing licenses) handling (bnc #439786) +- r11543 + +------------------------------------------------------------------- Wed Oct 29 03:45:58 CET 2008 - jkupec(a)suse.cz - fix reporting of unknown options in a short options bunch -- 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] r11543 - /trunk/zypper/src/utils/pager.cc
by jkupec＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: jkupec Date: Thu Oct 30 10:25:04 2008 New Revision: 11543 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11543&view=rev Log: - fixed pager process (for viewing licenses) handling (bnc #439786) Modified: trunk/zypper/src/utils/pager.cc Modified: trunk/zypper/src/utils/pager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/utils/pager.cc?rev=11… ============================================================================== --- trunk/zypper/src/utils/pager.cc (original) +++ trunk/zypper/src/utils/pager.cc Thu Oct 30 10:25:04 2008 @@ -17,8 +17,10 @@ #include "zypp/TmpPath.h" #include "zypp/Pathname.h" #include "zypp/PathInfo.h" +#include "zypp/ExternalProgram.h" #include "../main.h" +#include "Zypper.h" #include "pager.h" @@ -41,15 +43,10 @@ static string pager_help_navigation(const string & pager) { - string endfour = pager.substr(pager.size()-4,4); - if (endfour == "less") - { + if (pager.rfind("less") == pager.size() - 5) return _("Use arrows or pgUp/pgDown keys to scroll the text by lines or pages."); - } - else if (endfour == "more") - { + else if (pager.rfind("more") == pager.size() - 5) return _("Use the Enter or Space key to scroll the text by lines or pages."); - } return string(); } @@ -60,7 +57,9 @@ ostringstream cmdline; cmdline << "'" << pager << "' '" << file << "'"; - switch(fork()) + string errmsg; + pid_t pid; + switch(pid = fork()) { case -1: WAR << "fork failed" << endl; @@ -69,12 +68,48 @@ case 0: execlp("sh","sh","-c",cmdline.str().c_str(),(char *)0); WAR << "exec failed with " << strerror(errno) << endl; - exit(1); // cannot return false here, because here is another process - // so only kill myself - //! \todo FIXME proper exit code, message? - - default: - wait(0); //wait until pager end to disallow possibly terminal collision + // exit, cannot return false here, because this is another process + //! \todo FIXME different exit code + message + exit(ZYPPER_EXIT_ERR_BUG); + + default: + DBG << "Executed pager process (pid: " << pid << ")" << endl; + + // wait until pager exits + int status = 0; + int ret; + do + { + ret = waitpid(pid, &status, 0); + } + while (ret == -1 && errno == EINTR); + + if (WIFEXITED (status)) + { + status = WEXITSTATUS (status); + if (status) + { + DBG << "Pid " << pid << " exited with status " << status << endl; + return false; + } + else + DBG << "Pid " << pid << " successfully completed" << endl; + } + else if (WIFSIGNALED (status)) + { + status = WTERMSIG (status); + WAR << "Pid " << pid << " was killed by signal " << status + << " (" << strsignal(status); + if (WCOREDUMP (status)) + WAR << ", core dumped"; + WAR << ")" << endl; + return false; + } + else + { + ERR << "Pid " << pid << " exited with unknown error" << endl; + return false; + } } return true; @@ -84,8 +119,8 @@ bool show_text_in_pager(const string & text, const string & intro) { - const char* envpager = getenv("PAGER"); - if (!envpager) + const char* envpager = ::getenv("PAGER"); + if (!envpager || ::strlen(envpager) == 0) envpager = "more"; // basic posix default, must be in PATH string pager(envpager); @@ -118,8 +153,8 @@ bool show_file_in_pager(const Pathname & file, const string & intro) { - const char* envpager = getenv("PAGER"); - if (!envpager) + const char* envpager = ::getenv("PAGER"); + if (!envpager || ::strlen(envpager) == 0) envpager = "more"; // basic posix default, must be in PATH string pager(envpager); -- 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] r11542 - /trunk/libzypp/zypp/Arch.cc
by mlandres＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mlandres Date: Wed Oct 29 16:29:28 2008 New Revision: 11542 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11542&view=rev Log: fix logging Modified: trunk/libzypp/zypp/Arch.cc Modified: trunk/libzypp/zypp/Arch.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Arch.cc?rev=11542&r… ============================================================================== --- trunk/libzypp/zypp/Arch.cc (original) +++ trunk/libzypp/zypp/Arch.cc Wed Oct 29 16:29:28 2008 @@ -10,7 +10,7 @@ * */ #include <iostream> -#include <set> +#include <list> #include "zypp/base/Logger.h" #include "zypp/base/NonCopyable.h" @@ -110,7 +110,14 @@ /** \relates Arch::CompatEntry Stream output */ inline std::ostream & operator<<( std::ostream & str, const Arch::CompatEntry & obj ) { - return str << str::form( "%-15s ", obj._archStr.c_str() ) << obj._idBit << ' ' + Arch::CompatEntry::CompatBits bit( obj._idBit ); + unsigned bitnum = 0; + while ( bit ) + { + ++bitnum; + bit >>= 1; + } + return str << str::form( "%-15s ", obj._archStr.c_str() ) << str::numstring(bitnum,2) << ' ' << obj._compatBits << ' ' << obj._compatScore; } @@ -232,10 +239,18 @@ const_iterator end() const { return _compatSet.end(); } + struct DumpOnCompare + { + int operator()( const CompatEntry & lhs, const CompatEntry & rhs ) const + { return lhs._idBit.value() < rhs._idBit.value(); } + }; + std::ostream & dumpOn( std::ostream & str ) const { str << "ArchCompatSet:"; - for ( const_iterator it = _compatSet.begin(); it != _compatSet.end(); ++it ) + std::list<CompatEntry> ov( _compatSet.begin(), _compatSet.end() ); + ov.sort( DumpOnCompare() ); + for_( it, ov.begin(), ov.end() ) { str << endl << ' ' << *it; } @@ -298,7 +313,7 @@ defCompatibleWith( _sh4a, _noarch,_sh4 ); // /////////////////////////////////////////////////////////////////// - dumpOn( USR ) << endl; + //dumpOn( USR ) << endl; } private: -- 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] r11541 - /trunk/libzypp/zypp/Arch.cc
by mlandres＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mlandres Date: Wed Oct 29 15:56:56 2008 New Revision: 11541 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11541&view=rev Log: more arch compat bits Modified: trunk/libzypp/zypp/Arch.cc Modified: trunk/libzypp/zypp/Arch.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Arch.cc?rev=11541&r… ============================================================================== --- trunk/libzypp/zypp/Arch.cc (original) +++ trunk/libzypp/zypp/Arch.cc Wed Oct 29 15:56:56 2008 @@ -38,7 +38,7 @@ /** Bitfield for architecture IDs and compatBits relation. * \note Need one bit for each builtin Arch. */ - typedef bit::BitField<uint32_t> CompatBits; + typedef bit::BitField<uint64_t> CompatBits; CompatEntry( const std::string & archStr_r, CompatBits::IntT idBit_r = 1 ) -- 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] r11540 - /trunk/libzypp/zypp/target/rpm/RpmDb.cc
by mlandres＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mlandres Date: Wed Oct 29 15:47:15 2008 New Revision: 11540 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11540&view=rev Log: Fix to compile Modified: trunk/libzypp/zypp/target/rpm/RpmDb.cc Modified: trunk/libzypp/zypp/target/rpm/RpmDb.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/rpm/RpmDb.cc… ============================================================================== --- trunk/libzypp/zypp/target/rpm/RpmDb.cc (original) +++ trunk/libzypp/zypp/target/rpm/RpmDb.cc Wed Oct 29 15:47:15 2008 @@ -2005,7 +2005,7 @@ opts.push_back("--percent"); // ZConfig defines cross-arch installation - if ( ! ZConfig::instance.systemArchitecture().compatibleWith( ZConfig::instance.defaultSystemArchitecture() ) ) + if ( ! ZConfig::instance().systemArchitecture().compatibleWith( ZConfig::instance().defaultSystemArchitecture() ) ) opts.push_back("--ignorearch"); if (flags & RPMINST_NODIGEST) -- 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] r11539 - in /trunk/libzypp: devel/devel.ma/NewPool.cc devel/devel.ma/TransList.cc zypp/Arch.cc zypp/parser/ProductFileReader.cc zypp/parser/ProductFileReader.h zypp/target/rpm/RpmDb.cc
by mlandres＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mlandres Date: Wed Oct 29 15:43:45 2008 New Revision: 11539 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11539&view=rev Log: Fix builtin Arch constants. Modified: trunk/libzypp/devel/devel.ma/NewPool.cc trunk/libzypp/devel/devel.ma/TransList.cc trunk/libzypp/zypp/Arch.cc trunk/libzypp/zypp/parser/ProductFileReader.cc trunk/libzypp/zypp/parser/ProductFileReader.h trunk/libzypp/zypp/target/rpm/RpmDb.cc Modified: trunk/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.c… ============================================================================== --- trunk/libzypp/devel/devel.ma/NewPool.cc (original) +++ trunk/libzypp/devel/devel.ma/NewPool.cc Wed Oct 29 15:43:45 2008 @@ -609,6 +609,10 @@ } + MIL << Arch_ppc.compatibleWith( Arch_x86_64 ) << endl; + MIL << Arch_i586.compatibleWith( Arch_x86_64 ) << endl; + + #if 0 getZYpp()->resolver()->addRequire( Capability("amarok") ); solve(); Modified: trunk/libzypp/devel/devel.ma/TransList.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/TransList… ============================================================================== --- trunk/libzypp/devel/devel.ma/TransList.cc (original) +++ trunk/libzypp/devel/devel.ma/TransList.cc Wed Oct 29 15:43:45 2008 @@ -182,6 +182,8 @@ return true; } +#include "zypp/base/Functional.h" + /****************************************************************** ** ** FUNCTION NAME : main @@ -193,7 +195,16 @@ { Measure x( "PARSE" ); - USR << parser::ProductFileReader::scanDir( &Consumer, sysRoot / "etc/products.d" ) << endl; + + parser::ProductFileData val; + std::vector<parser::ProductFileData> result; + + parser::ProductFileReader::scanDir( functor::getFirst( val ), + //functor::getAll( std::back_inserter( result ) ), + sysRoot / "etc/products.d" ); + + USR << val << endl; + USR << result << endl; } #if 0 Modified: trunk/libzypp/zypp/Arch.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Arch.cc?rev=11539&r… ============================================================================== --- trunk/libzypp/zypp/Arch.cc (original) +++ trunk/libzypp/zypp/Arch.cc Wed Oct 29 15:43:45 2008 @@ -131,13 +131,19 @@ namespace zypp { ///////////////////////////////////////////////////////////////// - // builtin architecture STRING VALUES + /////////////////////////////////////////////////////////////////// + namespace + { ///////////////////////////////////////////////////////////////// + + // Builtin architecture STRING VALUES to be + // used in defCompatibleWith below! + // + // const IdString _foo( "foo" ); // - // For arch 'foo' this macro defines: - // const IdString _foo( "foo" ); // to be used in defCompatibleWith below! - // const Arch Arch_foo( _foo ); + // NOTE: Builtin CLASS Arch CONSTANTS are defined below. + // You have to change them accordingly. // -#define DEF_BUILTIN(A) namespace { const IdString _##A( #A ); } const Arch Arch_##A( _##A ) +#define DEF_BUILTIN(A) const IdString _##A( #A ); DEF_BUILTIN( noarch ); DEF_BUILTIN( i386 ); @@ -184,10 +190,6 @@ DEF_BUILTIN( sh4a ); #undef DEF_BUILTIN - /////////////////////////////////////////////////////////////////// - namespace - { ///////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// // // CLASS NAME : CompatSet @@ -355,9 +357,50 @@ /////////////////////////////////////////////////////////////////// const Arch Arch_empty ( IdString::Empty ); + const Arch Arch_noarch( _noarch ); + + const Arch Arch_i386( _i386 ); + const Arch Arch_i486( _i486 ); + const Arch Arch_i586( _i586 ); + const Arch Arch_i686( _i686 ); + const Arch Arch_athlon( _athlon ); + const Arch Arch_x86_64( _x86_64 ); + + const Arch Arch_pentium3( _pentium3 ); + const Arch Arch_pentium4( _pentium4 ); + + const Arch Arch_s390( _s390 ); + const Arch Arch_s390x( _s390x ); + + const Arch Arch_ppc( _ppc ); + const Arch Arch_ppc64( _ppc64 ); + + const Arch Arch_ia64( _ia64 ); + + const Arch Arch_alphaev67( _alphaev67 ); + const Arch Arch_alphaev6( _alphaev6 ); + const Arch Arch_alphapca56( _alphapca56 ); + const Arch Arch_alphaev56( _alphaev56 ); + const Arch Arch_alphaev5( _alphaev5 ); + const Arch Arch_alpha( _alpha ); + + const Arch Arch_sparc64( _sparc64 ); + const Arch Arch_sparcv9( _sparcv9 ); + const Arch Arch_sparcv8( _sparcv8 ); + const Arch Arch_sparc( _sparc ); + + const Arch Arch_armv6l( _armv6l ); + const Arch Arch_armv5tejl( _armv5tejl ); + const Arch Arch_armv5tel( _armv5tel ); + const Arch Arch_armv5l( _armv5l ); + const Arch Arch_armv4tl( _armv4tl ); + const Arch Arch_armv4l( _armv4l ); + const Arch Arch_armv3l( _armv3l ); + + const Arch Arch_sh3( _sh3 ); - // all other Arch_* constants are defined via - // the DEF_BUILTIN macro. See Above. + const Arch Arch_sh4( _sh4 ); + const Arch Arch_sh4a( _sh4a ); /////////////////////////////////////////////////////////////////// // Modified: trunk/libzypp/zypp/parser/ProductFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/ProductFileR… ============================================================================== --- trunk/libzypp/zypp/parser/ProductFileReader.cc (original) +++ trunk/libzypp/zypp/parser/ProductFileReader.cc Wed Oct 29 15:43:45 2008 @@ -12,10 +12,12 @@ #include <iostream> #include "zypp/base/Logger.h" #include "zypp/base/Exception.h" +#include "zypp/base/Functional.h" #include "zypp/PathInfo.h" #include "zypp/parser/ProductFileReader.h" +#include "zypp/parser/xml/ParseDef.h" #include "zypp/parser/xml/Reader.h" using std::endl; @@ -93,11 +95,11 @@ std::ostream & operator<<( std::ostream & str, const ProductFileData & obj ) { - str << str::form( "|product|%s|%s|%s|%s|", + str << str::form( "|product|%s|%s|%s|%s|%p", obj.name().c_str(), obj.edition().c_str(), obj.arch().c_str(), - obj.vendor().c_str() ); + obj.vendor().c_str(), (const void *)&obj ); return str; } @@ -106,16 +108,50 @@ // class ProductFileReader // ///////////////////////////////////////////////////////////////// + bool consumeNode( xml::Reader & reader_r ) { //DBG << *reader_r << endl; return true; } + struct ProductNode : public xml::ParseDef + { + ProductNode( Mode mode_r ) + : ParseDef( "product", mode_r ) + { + (*this)("ident", OPTIONAL) + ("onsys", OPTIONAL) + ; + + (*this)["ident"] + ("name", OPTIONAL) + ("version", OPTIONAL) + ("description", OPTIONAL) + ("created", OPTIONAL) + ; + + (*this)["onsys"] + ("entry", MULTIPLE_OPTIONAL) + ; + } + }; + bool ProductFileReader::parse( const InputStream & input_r ) const { - INT << "+++" << input_r << endl; + MIL << "+++" << input_r << endl; bool ret = true; + xml::ParseDef::_debug = true; + + xml::Reader reader( input_r ); + + ProductNode rootNode( xml::ParseDef::MANDTAORY ); + rootNode.take( reader ); + ret = false; + + MIL << "---" << ret << " - " << input_r << endl; + return ret; + try { xml::Reader reader( input_r ); @@ -126,13 +162,24 @@ // parse error ERR << err << endl; } - INT << "---" << ret << " - " << input_r << endl; + + if ( _consumer ) + { + static unsigned idx = 0; + + ProductFileData::Impl * i = new ProductFileData::Impl; + i->_name = IdString( str::numstring( ++idx, 4 ) ); + ret = _consumer( i ); + } + + MIL << "---" << ret << " - " << input_r << endl; return ret; } + ///////////////////////////////////////////////////////////////// + bool ProductFileReader::scanDir( const Consumer & consumer_r, const Pathname & dir_r ) { - DBG << "+++ scanDir " << dir_r << endl; std::list<Pathname> retlist; int res = filesystem::readdir( retlist, dir_r, /*dots*/false ); if ( res != 0 ) @@ -149,13 +196,21 @@ return false; // consumer_r request to stop parsing. } } - DBG << "--- scanDir " << dir_r << endl; return true; } - ProductFileData ProductFileReader::scanFile( const Pathname & dir_r ) + ProductFileData ProductFileReader::scanFile( const Pathname & file_r ) { - } + if ( ! PathInfo( file_r ).isFile() ) + { + WAR << "scanFile " << PathInfo( file_r ) << " is no t a file." << endl; + return ProductFileData(); + } + + ProductFileData ret; + ProductFileReader reader( functor::getFirst( ret ), file_r ); + return ret; + } ///////////////////////////////////////////////////////////////// } // namespace parser Modified: trunk/libzypp/zypp/parser/ProductFileReader.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/ProductFileR… ============================================================================== --- trunk/libzypp/zypp/parser/ProductFileReader.h (original) +++ trunk/libzypp/zypp/parser/ProductFileReader.h Wed Oct 29 15:43:45 2008 @@ -44,6 +44,10 @@ /** Ctor takes ownership of \c allocated_r. */ ProductFileData( Impl * allocated_r = 0 ); + /** Whether this is an empty object without valid data. */ + bool empty() const + { return name().empty(); } + public: IdString vendor() const; IdString name() const; @@ -95,13 +99,21 @@ // CLASS NAME : ProductFileReader // /** Parser for /etc/products.d enries (just relevant entires). + * + * \code + * #include "zypp/base/Functional.h" // functor::getAll + * + * std::vector<ProductFileData> result; + * ProductFileReader::scanDir( functor::getAll( std::back_inserter( result ) ), + * "/etc/products.d" ); + * \endcode */ class ProductFileReader { public: /** Callback being invoked for each \ref ProductFileData parsed. * Return \c false to stop parsing. - */ + */ typedef function<bool( const ProductFileData & )> Consumer; public: @@ -139,9 +151,9 @@ */ static bool scanDir( const Consumer & consumer_r, const Pathname & dir_r ); - /** Parse one file (or symlink) and return the \ref ProductFileData parsed. - */ - static ProductFileData scanFile( const Pathname & dir_r ); + /** Parse one file (or symlink) and return the \ref ProductFileData parsed. + */ + static ProductFileData scanFile( const Pathname & file_r ); private: Consumer _consumer; Modified: trunk/libzypp/zypp/target/rpm/RpmDb.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/rpm/RpmDb.cc… ============================================================================== --- trunk/libzypp/zypp/target/rpm/RpmDb.cc (original) +++ trunk/libzypp/zypp/target/rpm/RpmDb.cc Wed Oct 29 15:43:45 2008 @@ -45,6 +45,7 @@ #include "zypp/TmpPath.h" #include "zypp/KeyRing.h" #include "zypp/ZYppFactory.h" +#include "zypp/ZConfig.h" using namespace std; using namespace zypp::filesystem; @@ -2000,8 +2001,13 @@ opts.push_back("-i"); else opts.push_back("-U"); + opts.push_back("--percent"); + // ZConfig defines cross-arch installation + if ( ! ZConfig::instance.systemArchitecture().compatibleWith( ZConfig::instance.defaultSystemArchitecture() ) ) + opts.push_back("--ignorearch"); + if (flags & RPMINST_NODIGEST) opts.push_back("--nodigest"); if (flags & RPMINST_NOSIGNATURE) -- 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] r11538 - /trunk/libzypp/zypp/Arch.cc
by mlandres＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mlandres Date: Wed Oct 29 15:15:43 2008 New Revision: 11538 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11538&view=rev Log: adjust namespace Modified: trunk/libzypp/zypp/Arch.cc Modified: trunk/libzypp/zypp/Arch.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Arch.cc?rev=11538&r… ============================================================================== --- trunk/libzypp/zypp/Arch.cc (original) +++ trunk/libzypp/zypp/Arch.cc Wed Oct 29 15:15:43 2008 @@ -296,7 +296,7 @@ defCompatibleWith( _sh4a, _noarch,_sh4 ); // /////////////////////////////////////////////////////////////////// - //dumpOn( USR ) << endl; + dumpOn( USR ) << endl; } private: -- 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] r11537 - /trunk/libzypp/zypp/Arch.cc
by mlandres＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mlandres Date: Wed Oct 29 15:09:41 2008 New Revision: 11537 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11537&view=rev Log: adjust namespace Modified: trunk/libzypp/zypp/Arch.cc Modified: trunk/libzypp/zypp/Arch.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Arch.cc?rev=11537&r… ============================================================================== --- trunk/libzypp/zypp/Arch.cc (original) +++ trunk/libzypp/zypp/Arch.cc Wed Oct 29 15:09:41 2008 @@ -131,17 +131,13 @@ namespace zypp { ///////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// - namespace - { ///////////////////////////////////////////////////////////////// - // builtin architecture STRING VALUES // // For arch 'foo' this macro defines: // const IdString _foo( "foo" ); // to be used in defCompatibleWith below! // const Arch Arch_foo( _foo ); // -#define DEF_BUILTIN(A) const IdString _##A( #A ); const Arch Arch_##A( _##A ) +#define DEF_BUILTIN(A) namespace { const IdString _##A( #A ); } const Arch Arch_##A( _##A ) DEF_BUILTIN( noarch ); DEF_BUILTIN( i386 ); @@ -188,6 +184,10 @@ DEF_BUILTIN( sh4a ); #undef DEF_BUILTIN + /////////////////////////////////////////////////////////////////// + namespace + { ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// // // CLASS NAME : CompatSet -- 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] r11536 - /trunk/libzypp/package/libzypp.changes
by jkupec＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jkupec Date: Wed Oct 29 14:15:10 2008 New Revision: 11536 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11536&view=rev Log: - changes Modified: trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Wed Oct 29 14:15:10 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 29 14:14:16 CET 2008 - jkupec(a)suse.cz + +- throw a MediaTimeoutException also on http 504 (gateway timeout) + (bnc #425035) +- revision 11535 + +------------------------------------------------------------------- Wed Oct 29 12:51:55 CET 2008 - ma(a)suse.de - Add 'sh4' architectures. -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0