August 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10890 - in /trunk/sat-solver/tools: repo_rpmmd.c repo_rpmmd.h rpmmd2solv.c
by dmacvicar＠svn.opensuse.org 22 Aug '08

22 Aug '08

Author: dmacvicar Date: Fri Aug 22 18:10:21 2008 New Revision: 10890 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10890&view=rev Log: - add support for arbitrary extendable metadata using external files - merge diskusage info (modified tag names) supporting in primary or in extension files dskusage definition - some language preaparation Modified: trunk/sat-solver/tools/repo_rpmmd.c trunk/sat-solver/tools/repo_rpmmd.h 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 Fri Aug 22 18:10:21 2008 @@ -22,7 +22,12 @@ enum state { STATE_START, + STATE_METADATA, + STATE_OTHERDATA, + STATE_DISKUSAGEDATA, + STATE_SUSEDATA, + STATE_SOLVABLE, STATE_PRODUCT, STATE_PATTERN, @@ -52,6 +57,12 @@ STATE_INSTALLTIME, STATE_INSTALLONLY, + /* Novell/SUSE extended attributes */ + STATE_EULA, + STATE_DISKUSAGE, + STATE_DIRS, + STATE_DIR, + /* patch */ STATE_ID, STATE_TIMESTAMP, @@ -117,6 +128,14 @@ }; static struct stateswitch stateswitches[] = { + /** fake tag used to enclose 2 different xml files in one **/ + { STATE_START, "rpmmd", STATE_START, 0 }, + + /** tags for different package data, we just ignore the tag **/ + { STATE_START, "metadata", STATE_START, 0 }, + { STATE_START, "otherdata", STATE_START, 0 }, + { STATE_START, "diskusagedata", STATE_START, 0 }, + { STATE_START, "susedata", STATE_START, 0 }, { STATE_START, "product", STATE_SOLVABLE, 0 }, { STATE_START, "pattern", STATE_SOLVABLE, 0 }, @@ -147,6 +166,12 @@ { STATE_SOLVABLE, "install-only", STATE_INSTALLONLY, 1 }, { STATE_SOLVABLE, "time", STATE_TIME, 0 }, + /* extended Novell/SUSE attributes (suseinfo.xml) */ + { STATE_SOLVABLE, "eula", STATE_EULA, 1 }, + { STATE_SOLVABLE, "diskusage", STATE_DISKUSAGE, 0 }, + { STATE_DISKUSAGE, "dirs", STATE_DIRS, 0 }, + { STATE_DIRS, "dir", STATE_DIR, 0 }, + // pattern attribute { STATE_SOLVABLE, "script", STATE_SCRIPT, 1 }, { STATE_SOLVABLE, "icon", STATE_ICON, 1 }, @@ -195,6 +220,10 @@ { NUMSTATES} }; +/* maxmum initial size of + the checksum cache */ +#define MAX_CSCACHE 32768 +#define CSREALLOC_STEP 1024 struct parsedata { struct parsedata_common common; @@ -210,7 +239,8 @@ Offset freshens; struct stateswitch *swtab[NUMSTATES]; enum state sbtab[NUMSTATES]; - const char *lang; + /* temporal to store attribute tag language */ + const char *tmplang; const char *capkind; // used to store tmp attributes // while the tag ends @@ -221,8 +251,97 @@ Id (*dirs)[3]; // dirid, size, nfiles int ndirs; Id langcache[ID_NUM_INTERNAL]; + /** system language */ + const char *language; + + /** Hash to maps checksums to solv */ + Stringpool cspool; + /** Cache of known checksums to solvable id */ + Id *cscache; + /* the current longest index in the table */ + int ncscache; }; +static Id +langtag(struct parsedata *pd, Id tag, const char *language) +{ + if (language && !language[0]) + language = 0; + if (!language || tag >= ID_NUM_INTERNAL) + return pool_id2langid(pd->common.repo->pool, tag, language, 1); + return pool_id2langid(pd->common.repo->pool, tag, language, 1); + if (!pd->langcache[tag]) + pd->langcache[tag] = pool_id2langid(pd->common.repo->pool, tag, language, 1); + return pd->langcache[tag]; +} + +static int +id3_cmp (const void *v1, const void *v2) +{ + Id *i1 = (Id*)v1; + Id *i2 = (Id*)v2; + return i1[0] - i2[0]; +} + +static void +commit_diskusage (struct parsedata *pd, unsigned handle) +{ + unsigned i; + Dirpool *dp = &pd->data->dirpool; + /* Now sort in dirid order. This ensures that parents come before + their children. */ + if (pd->ndirs > 1) + qsort(pd->dirs, pd->ndirs, sizeof (pd->dirs[0]), id3_cmp); + /* Substract leaf numbers from all parents to make the numbers + non-cumulative. This must be done post-order (i.e. all leafs + adjusted before parents). We ensure this by starting at the end of + the array moving to the start, hence seeing leafs before parents. */ + for (i = pd->ndirs; i--;) + { + unsigned p = dirpool_parent(dp, pd->dirs[i][0]); + unsigned j = i; + for (; p; p = dirpool_parent(dp, p)) + { + for (; j--;) + if (pd->dirs[j][0] == p) + break; + if (j < pd->ndirs) + { + if (pd->dirs[j][1] < pd->dirs[i][1]) + pd->dirs[j][1] = 0; + else + pd->dirs[j][1] -= pd->dirs[i][1]; + if (pd->dirs[j][2] < pd->dirs[i][2]) + pd->dirs[j][2] = 0; + else + pd->dirs[j][2] -= pd->dirs[i][2]; + } + else + /* Haven't found this parent in the list, look further if + we maybe find the parents parent. */ + j = i; + } + } +#if 0 + char sbuf[1024]; + char *buf = sbuf; + unsigned slen = sizeof (sbuf); + for (i = 0; i < pd->ndirs; i++) + { + dir2str (attr, pd->dirs[i][0], &buf, &slen); + fprintf (stderr, "have dir %d %d %d %s\n", pd->dirs[i][0], pd->dirs[i][1], pd->dirs[i][2], buf); + } + if (buf != sbuf) + free (buf); +#endif + for (i = 0; i < pd->ndirs; i++) + if (pd->dirs[i][1] || pd->dirs[i][2]) + { + repodata_add_dirnumnum(pd->data, handle, SOLVABLE_DISKUSAGE, pd->dirs[i][0], pd->dirs[i][1], pd->dirs[i][2]); + } + pd->ndirs = 0; +} + /* * makeevr_atts @@ -555,15 +674,60 @@ else if (name[2] == 't' && name[3] == 'c') pd->kind = "patch"; - /* this is a new package */ - /*fprintf(stderr, "new package\n");*/ - pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->common.repo)); - pd->freshens = 0; - repodata_extend(pd->data, pd->solvable - pool->solvables); + /* to support extension metadata files like others.xml which + have the following structure: + + <otherdata xmlns="http://linux.duke.edu/metadata/other" + packages="101"> + <package pkgid="b78f8664cd90efe42e09a345e272997ef1b53c18" + name="zaptel-kmp-default" + arch="i586"><version epoch="0" + ver="1.2.10_2.6.22_rc4_git6_2" rel="70"/> + ... + + we need to check if the pkgid is there and if it matches + an already seen package, that means we don't need to create + a new solvable but just append the attributes to the existing + one. + */ + const char *pkgid; + if ( (pkgid = find_attr("pkgid", atts)) != NULL ) + { + int found = 0; + /*const char *name = find_attr("name", atts);*/ + // look at the checksum cache + Id index = stringpool_str2id (&pd->cspool, pkgid, 1 /* create it */); + if ( index < pd->ncscache ) + { + Id solvid = pd->cscache[index-1]; + /* printf */ + if ( solvid > 0 ) + { + Solvable *s = pool_id2solvable(pool, solvid); + /* we found the already defined package */ + pd->solvable = s; + found = 1; + /*fprintf(stderr, "package found %s-%s.\n", name, find_attr("arch", atts));*/ + } + } + if ( ! found ) + { + fprintf(stderr, "error, the repository specifies extra information about package with checksum '%s', which does not exist in the repository.\n", pkgid); + exit(1); + } + } + else + { + /* this is a new package */ + pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->common.repo)); + pd->freshens = 0; + repodata_extend(pd->data, pd->solvable - pool->solvables); + } pd->handle = repodata_get_handle(pd->data, (pd->solvable - pool->solvables) - pd->data->start); #if 0 fprintf(stderr, "package #%d\n", pd->solvable - pool->solvables); #endif + break; case STATE_VERSION: s->evr = makeevr_atts(pool, pd, atts); @@ -624,7 +788,7 @@ break; case STATE_SUMMARY: case STATE_DESCRIPTION: - pd->lang = find_attr("lang", atts); + pd->tmplang = find_attr("lang", atts); break; case STATE_LOCATION: str = find_attr("href", atts); @@ -676,7 +840,50 @@ if (str && (end = atoi(str)) != 0) repodata_set_num(pd->data, handle, SOLVABLE_HEADEREND, end); } - + /* + <diskusage> + <dirs> + <dir name="/" size="56" count="11"/> + <dir name="usr/" size="56" count="11"/> + <dir name="usr/bin/" size="38" count="10"/> + <dir name="usr/share/" size="18" count="1"/> + <dir name="usr/share/doc/" size="18" count="1"/> + </dirs> + </diskusage> + */ + case STATE_DISKUSAGE: + { + /* Really, do nothing, wat for <dir> tag */ + break; + } + case STATE_DIR: + { + long filesz = 0, filenum = 0; + unsigned dirid; + if ( (str = find_attr("name", atts)) ) + { + dirid = repodata_str2dir(pd->data, str, 1); + } + else + { + fprintf( stderr, "<dir .../> tag without 'name' attribute, atts = %p, *atts = %p\n", atts, *atts); + break; + } + if ( (str = find_attr("size", atts)) ) + { + filesz = strtol (str, 0, 0); + } + if ( (str = find_attr("count", atts)) ) + { + filenum = strtol (str, 0, 0); + } + pd->dirs = sat_extend(pd->dirs, pd->ndirs, 1, sizeof(pd->dirs[0]), 31); + pd->dirs[pd->ndirs][0] = dirid; + pd->dirs[pd->ndirs][1] = filesz; + pd->dirs[pd->ndirs][2] = filenum; + pd->ndirs++; + break; + } default: break; } @@ -770,6 +977,21 @@ exit(1); } repodata_set_checksum(pd->data, handle, SOLVABLE_CHECKSUM, type, pd->content); + /* we save the checksum to solvable id relationship for extended + metadata */ + Id index = stringpool_str2id (&pd->cspool, pd->content, 1 /* create it */); + if ( index >= pd->ncscache ) + { + /** realloc for this index plus CSREALLOC_STEP*/ + pd->cscache = (Id *) sat_zextend(pd->cscache, pd->ncscache, index - pd->ncscache +1, sizeof(Id), 255); + /** fill the realloced part with 0s */ + + pd->ncscache = index +1; + + } + /* add the checksum to the cache */ + pd->cscache[index-1] = s - pool->solvables; + } break; case STATE_FILE: @@ -792,11 +1014,11 @@ repodata_add_dirstr(pd->data, handle, SOLVABLE_FILELIST, id, p); break; case STATE_SUMMARY: - pd->lang = 0; + pd->tmplang = 0; repodata_set_str(pd->data, handle, SOLVABLE_SUMMARY, pd->content); break; case STATE_DESCRIPTION: - pd->lang = 0; + pd->tmplang = 0; set_desciption_author(pd->data, handle, pd->content); break; case STATE_DISTRIBUTION: @@ -837,6 +1059,14 @@ if (pd->content[0]) repodata_set_str(pd->data, handle, PRODUCT_REFERENCES, pd->content); break; + case STATE_EULA: + if (pd->content[0]) + repodata_set_str(pd->data, handle, langtag(pd, SOLVABLE_EULA, pd->language), pd->content); + break; + case STATE_DISKUSAGE: + if (pd->ndirs) + commit_diskusage (pd, pd->handle); + break; default: break; } @@ -887,7 +1117,7 @@ */ void -repo_add_rpmmd(Repo *repo, FILE *fp, int flags) +repo_add_rpmmd(Repo *repo, FILE *fp, const char *language, int flags) { Pool *pool = repo->pool; struct parsedata pd; @@ -913,6 +1143,15 @@ pd.common.tmp = 0; pd.common.tmpl = 0; pd.kind = 0; + pd.language = language; + + /* initialize the string pool where we will store + the package checksums we know about, to get an Id + we can use in a cache */ + stringpool_init_empty(&pd.cspool); + pd.cscache = (Id *) calloc(MAX_CSCACHE, sizeof(Id)); + pd.ncscache = MAX_CSCACHE; + XML_Parser parser = XML_ParserCreate(NULL); XML_SetUserData(parser, &pd); pd.parser = &parser; Modified: trunk/sat-solver/tools/repo_rpmmd.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.h?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmmd.h (original) +++ trunk/sat-solver/tools/repo_rpmmd.h Fri Aug 22 18:10:21 2008 @@ -7,4 +7,4 @@ #define RPMMD_KINDS_SEPARATELY 1 -extern void repo_add_rpmmd(Repo *repo, FILE *fp, int flags); +extern void repo_add_rpmmd(Repo *repo, FILE *fp, const char *language, int flags); 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 Fri Aug 22 18:10:21 2008 @@ -121,12 +121,12 @@ perror(fnp); exit(1); } - repo_add_rpmmd(repo, fp, flags); + repo_add_rpmmd(repo, fp, 0, flags); fclose(fp); - snprintf(fnp, l, "%s/diskusage.xml.gz", dir); + snprintf(fnp, l, "%s/diskusagedata.xml.gz", dir); if ((fp = myfopen(fnp))) { - repo_add_rpmmd(repo, fp, flags); + repo_add_rpmmd(repo, fp, 0, flags); fclose(fp); } if (locale) @@ -153,13 +153,13 @@ exit(1); } fprintf(stderr, "opened %s\n", fnp); - repo_add_rpmmd(repo, fp, flags); + repo_add_rpmmd(repo, fp, 0, flags); fclose(fp); } sat_free(fnp); } else - repo_add_rpmmd(repo, stdin, flags); + repo_add_rpmmd(repo, stdin, 0, flags); tool_write(repo, basefile, attrname); pool_free(pool); exit(0); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10889 - /trunk/sat-solver/src/util.h
by dmacvicar＠svn.opensuse.org 22 Aug '08

22 Aug '08

Author: dmacvicar Date: Fri Aug 22 18:10:19 2008 New Revision: 10889 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10889&view=rev Log: - comment function Modified: trunk/sat-solver/src/util.h Modified: trunk/sat-solver/src/util.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/util.h?rev=10889&… ============================================================================== --- trunk/sat-solver/src/util.h (original) +++ trunk/sat-solver/src/util.h Fri Aug 22 18:10:19 2008 @@ -16,6 +16,10 @@ #include <stddef.h> #include <string.h> +/** + * malloc + * exits with error message on error + */ extern void *sat_malloc(size_t); extern void *sat_malloc2(size_t, size_t); extern void *sat_calloc(size_t, size_t); @@ -39,6 +43,14 @@ return buf; } +/** + * extend an array by reallocation and zero's the new section + * buf old pointer + * len current size + * nmbemb number of elements to add + * size size of each element + * block block size used to allocate the elements + */ static inline void *sat_zextend(void *buf, size_t len, size_t nmemb, size_t size, size_t block) { buf = sat_extend(buf, len, nmemb, size, block); -- 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] r10888 - in /trunk/zypper: CMakeLists.txt package/zypper.changes src/solve-commit.cc zypper.spec.cmake
by dmacvicar＠svn.opensuse.org 19 Aug '08

19 Aug '08

Author: dmacvicar Date: Tue Aug 19 16:47:38 2008 New Revision: 10888 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10888&view=rev Log: unsupported packages confirm in SLE fate#305057 Modified: trunk/zypper/CMakeLists.txt trunk/zypper/package/zypper.changes trunk/zypper/src/solve-commit.cc trunk/zypper/zypper.spec.cmake Modified: trunk/zypper/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/CMakeLists.txt?rev=10888&… ============================================================================== --- trunk/zypper/CMakeLists.txt (original) +++ trunk/zypper/CMakeLists.txt Tue Aug 19 16:47:38 2008 @@ -41,6 +41,11 @@ MESSAGE( FATAL_ERROR "readline not found" ) ENDIF( READLINE_FOUND ) +IF( ZYPPER_CONFIRM_UNSUPPORTED_PACKAGES ) + ADD_DEFINITIONS( -DZYPPER_CONFIRM_UNSUPPORTED_PACKAGES ) +ENDIF( ZYPPER_CONFIRM_UNSUPPORTED_PACKAGES ) + + ADD_SUBDIRECTORY( src ) ADD_SUBDIRECTORY( po ) ADD_SUBDIRECTORY( doc ) 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 Tue Aug 19 16:47:38 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 19 16:39:32 CEST 2008 - dmacvicar(a)suse.de + +- confirm unsupported packages in SLE + (fate#305057) + +------------------------------------------------------------------- Mon Aug 18 17:50:02 CEST 2008 - dmacvicar(a)suse.de - warn if repostory seems to be outdated Modified: trunk/zypper/src/solve-commit.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/solve-commit.cc?rev=1… ============================================================================== --- trunk/zypper/src/solve-commit.cc (original) +++ trunk/zypper/src/solve-commit.cc Tue Aug 19 16:47:38 2008 @@ -271,7 +271,8 @@ TO_REINSTALL, TO_REMOVE, TO_CHANGE_ARCH, - TO_CHANGE_VENDOR + TO_CHANGE_VENDOR, + UNSUPPORTED } SummaryType; static void xml_print_to_transact_tag(SummaryType stype, bool end = false) @@ -299,6 +300,9 @@ case TO_CHANGE_VENDOR: cout << "<" << (end ? "/" : "") << "to-change-vendor>" << endl; break; + case UNSUPPORTED: + cout << "<" << (end ? "/" : "") << "unsupported>" << endl; + break; } } @@ -510,6 +514,14 @@ "The following products are going to change vendor:", it->second.size()); break; + case UNSUPPORTED: + // we only look vendor support in packages + if (it->first == ResKind::package) + title = _PL( + "The following package is not supported by its vendor:", + "The following packages are not supported by their vendor:", + it->second.size()); + break; } show_summary_resolvable_list(title, it, zypper.out()); @@ -605,7 +617,10 @@ KindToResObjectSet toremove; KindToResObjectSet tochangearch; KindToResObjectSet tochangevendor; - + // objects from previous lists that + // are not supported + KindToResObjectSet tounsupported; + // iterate the to_be_installed to find installs/upgrades/downgrades + size info ByteCount download_size, new_installed_size; @@ -617,6 +632,16 @@ { ResObject::constPtr res(*resit); + // FIXME asKind not working? + Package::constPtr pkg = asKind<Package>(res); + if ( pkg ) + { + // FIXME refactor with libzypp Package::vendorSupportAvailable() + + if ( pkg->maybeUnsupported() ) + tounsupported[res->kind()].insert(res); + } + // find in to_be_removed: bool upgrade_downgrade = false; for (set<ResObject::constPtr>::iterator rmit = to_be_removed[res->kind()].begin(); @@ -716,7 +741,9 @@ show_summary_of_type(zypper, TO_REMOVE, toremove); show_summary_of_type(zypper, TO_CHANGE_ARCH, tochangearch); show_summary_of_type(zypper, TO_CHANGE_VENDOR, tochangevendor); - +#ifdef ZYPPER_CONFIRM_UNSUPPORTED_PACKAGES + show_summary_of_type(zypper, UNSUPPORTED, tounsupported); +#endif // "</install-summary>" if (zypper.out().type() == Out::TYPE_XML) cout << "</install-summary>" << endl; Modified: trunk/zypper/zypper.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/zypper.spec.cmake?rev=108… ============================================================================== --- trunk/zypper/zypper.spec.cmake (original) +++ trunk/zypper/zypper.spec.cmake Tue Aug 19 16:47:38 2008 @@ -11,7 +11,7 @@ # norootforbuild Name: @PACKAGE@ -BuildRequires: libzypp-devel >= 5.4.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 +BuildRequires: libzypp-devel >= 5.7.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6 Requires: procps Recommends: logrotate cron @@ -46,6 +46,9 @@ mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ +%if 0%{?sles_version} + -DZYPPER_CONFIRM_UNSUPPORTED_PACKAGES \ +%endif -DSYSCONFDIR=%{_sysconfdir} \ -DMANDIR=%{_mandir} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -- 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] r10887 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes zypp/Package.cc zypp/Package.h
by dmacvicar＠svn.opensuse.org 19 Aug '08

19 Aug '08

Author: dmacvicar Date: Tue Aug 19 16:47:36 2008 New Revision: 10887 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10887&view=rev Log: + Package::maybeUnsupported Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/Package.cc trunk/libzypp/zypp/Package.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=10887&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Tue Aug 19 16:47:36 2008 @@ -60,8 +60,8 @@ # SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "5") -SET(LIBZYPP_MINOR "6") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_MINOR "7") +SET(LIBZYPP_PATCH "0") # # LAST RELEASED: 5.6.1 (5) # (The number in parenthesis is LIBZYPP_COMPATMINOR) 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 Tue Aug 19 16:47:36 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 19 16:36:47 CEST 2008 - dmacvicar(a)suse.de + +- add Package::maybeUnsupported to remove duplicated + code in clients dealing with Package::vendorSupport + +------------------------------------------------------------------- Di 19. Aug 10:34:39 CEST 2008 - schubi(a)waerden.suse.de - Reset transaction only if this solvable has no buddy (bnc #417799) Modified: trunk/libzypp/zypp/Package.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Package.cc?rev=1088… ============================================================================== --- trunk/libzypp/zypp/Package.cc (original) +++ trunk/libzypp/zypp/Package.cc Tue Aug 19 16:47:36 2008 @@ -63,6 +63,12 @@ return VendorSupportUnknown; } + bool Package::maybeUnsupported() const + { + return ( vendorSupport() & ( VendorSupportACC | VendorSupportUnsupported | VendorSupportUnknown ) == ( VendorSupportACC | VendorSupportUnsupported | VendorSupportUnknown ) ); + } + + Changelog Package::changelog() const { Target_Ptr target; Modified: trunk/libzypp/zypp/Package.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Package.h?rev=10887… ============================================================================== --- trunk/libzypp/zypp/Package.h (original) +++ trunk/libzypp/zypp/Package.h Tue Aug 19 16:47:36 2008 @@ -50,6 +50,12 @@ */ VendorSupportOption vendorSupport() const; + /** + * True if the vendor support for this package + * is unknown or explictly unsupported. + */ + bool maybeUnsupported() const; + /** Get the package change log */ Changelog changelog() const; /** */ -- 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] r10886 - /trunk/libzypp/zypp/Repository.cc
by dmacvicar＠svn.opensuse.org 19 Aug '08

19 Aug '08

Author: dmacvicar Date: Tue Aug 19 13:35:18 2008 New Revision: 10886 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10886&view=rev Log: handle border cases Modified: trunk/libzypp/zypp/Repository.cc Modified: trunk/libzypp/zypp/Repository.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Repository.cc?rev=1… ============================================================================== --- trunk/libzypp/zypp/Repository.cc (original) +++ trunk/libzypp/zypp/Repository.cc Tue Aug 19 13:35:18 2008 @@ -92,6 +92,12 @@ { ::Dataiterator di; ::dataiterator_init(&di, get(), -1, 0, 0, SEARCH_EXTRA | SEARCH_NO_STORAGE_SOLVABLE); + Date generated = generatedTimestamp(); + // do not calculate over a missing generated + // timestamp + if ( generated == Date() ) + return Date(); + if (::dataiterator_step(&di)) { do @@ -100,7 +106,7 @@ { case REPOSITORY_EXPIRE: { - return generatedTimestamp() + di.kv.num; + return generated + di.kv.num; break; } } @@ -124,6 +130,12 @@ if ( isSystemRepo() ) return false; + Date suggested = suggestedExpirationTimestamp(); + + // if no data, don't suggest + if ( suggested == Date() ) + return false; + return suggestedExpirationTimestamp() < Date::now(); } -- 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] r10885 - in /trunk/libzypp: package/libzypp.changes zypp/target/TargetImpl.cc
by schubi2＠svn.opensuse.org 19 Aug '08

19 Aug '08

Author: schubi2 Date: Tue Aug 19 10:39:03 2008 New Revision: 10885 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10885&view=rev Log: typo Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/target/TargetImpl.cc 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 Tue Aug 19 10:39:03 2008 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Di 19. Aug 10:34:39 CEST 2008 - schubi(a)waerden.suse.de -- Reset transaction only if this solvable has not buddy (bnc #417799) +- Reset transaction only if this solvable has no buddy (bnc #417799) e.g. do not reset Products cause the concerning release package could not already be installed. - revision 10883 Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.c… ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Tue Aug 19 10:39:03 2008 @@ -813,7 +813,7 @@ { if (it->buddy() == sat::Solvable()) { - // Reset transaction only if this solvable has not buddy (Bug #417799) + // Reset transaction only if this solvable has no buddy (Bug #417799) // e.g. do not reset Products cause the concerning release package // could not already be installed. it->status().resetTransact( ResStatus::USER ); -- 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] r10884 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes
by schubi2＠svn.opensuse.org 19 Aug '08

19 Aug '08

Author: schubi2 Date: Tue Aug 19 10:36:16 2008 New Revision: 10884 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10884&view=rev Log: Version 5.6.1 Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=10884&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Tue Aug 19 10:36:16 2008 @@ -63,6 +63,6 @@ SET(LIBZYPP_MINOR "6") SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 5.6.0 (5) +# LAST RELEASED: 5.6.1 (5) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= 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 Tue Aug 19 10:36:16 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Di 19. Aug 10:34:39 CEST 2008 - schubi(a)waerden.suse.de + +- Reset transaction only if this solvable has not buddy (bnc #417799) + e.g. do not reset Products cause the concerning release package + could not already be installed. +- revision 10883 +- version 5.6.1 (5) + +------------------------------------------------------------------- Mon Aug 18 17:31:02 CEST 2008 - dmacvicar(a)suse.de - don't report "may be outdated" for @System repo. -- 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] r10883 - /trunk/libzypp/zypp/target/TargetImpl.cc
by schubi2＠svn.opensuse.org 19 Aug '08

19 Aug '08

Author: schubi2 Date: Tue Aug 19 10:27:54 2008 New Revision: 10883 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10883&view=rev Log: Reset transaction only if this solvable has not buddy (Bug #417799) e.g. do not reset Products cause the concerning release package could not already be installed. Modified: trunk/libzypp/zypp/target/TargetImpl.cc Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.c… ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Tue Aug 19 10:27:54 2008 @@ -811,7 +811,13 @@ } else if (!policy_r.dryRun()) // other resolvables (non-Package) { - it->status().resetTransact( ResStatus::USER ); + if (it->buddy() == sat::Solvable()) + { + // Reset transaction only if this solvable has not buddy (Bug #417799) + // e.g. do not reset Products cause the concerning release package + // could not already be installed. + it->status().resetTransact( ResStatus::USER ); + } } // other resolvables } // for -- 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] r10882 - in /trunk/zypper: VERSION.cmake package/zypper.changes src/repos.cc
by dmacvicar＠svn.opensuse.org 18 Aug '08

18 Aug '08

Author: dmacvicar Date: Mon Aug 18 17:57:19 2008 New Revision: 10882 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10882&view=rev Log: fate #301904, warn if repo seems outdated Modified: trunk/zypper/VERSION.cmake trunk/zypper/package/zypper.changes trunk/zypper/src/repos.cc Modified: trunk/zypper/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/VERSION.cmake?rev=10882&r… ============================================================================== --- trunk/zypper/VERSION.cmake (original) +++ trunk/zypper/VERSION.cmake Mon Aug 18 17:57:19 2008 @@ -20,4 +20,4 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "12") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") 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 Mon Aug 18 17:57:19 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 18 17:50:02 CEST 2008 - dmacvicar(a)suse.de + +- warn if repostory seems to be outdated + (fate#301904) +- 0.12.2 + +------------------------------------------------------------------- Sat Aug 2 19:40:37 CEST 2008 - jkupec(a)suse.cz - service handling improved, ls, rs, refs now allow to specify Modified: trunk/zypper/src/repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.cc?rev=10882&r1… ============================================================================== --- trunk/zypper/src/repos.cc (original) +++ trunk/zypper/src/repos.cc Mon Aug 18 17:57:19 2008 @@ -2393,6 +2393,23 @@ } manager.loadFromCache(repo); + + + + // check that the metadata is not outdated + // feature #301904 + Repository robj = God->pool().reposFind(repo.alias()); + if ( robj != Repository::noRepository && + robj.maybeOutdated() ) + { + + zypper.out().warning(boost::str(format( + _("Repository '%s' appears to outdated. Consider using a different mirror or server.")) + % repo.name()), Out::QUIET); + WAR << format("Repository '%s' seems to be outdated") + % repo.name() << endl; + + } } catch (const Exception & e) { -- 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] r10881 - /trunk/libzypp/VERSION.cmake
by dmacvicar＠svn.opensuse.org 18 Aug '08

18 Aug '08

Author: dmacvicar Date: Mon Aug 18 17:42:03 2008 New Revision: 10881 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10881&view=rev Log: bump Modified: trunk/libzypp/VERSION.cmake Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=10881&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Mon Aug 18 17:42:03 2008 @@ -61,7 +61,7 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "5") SET(LIBZYPP_MINOR "6") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # # LAST RELEASED: 5.6.0 (5) # (The number in parenthesis is LIBZYPP_COMPATMINOR) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0