August 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10870 - in /trunk/sat-solver: package/libsatsolver.changes tools/repo_products.c tools/repo_products.h tools/rpmdb2solv.c
by kkaempf＠svn.opensuse.org 15 Aug '08

15 Aug '08

Author: kkaempf Date: Fri Aug 15 14:28:43 2008 New Revision: 10870 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10870&view=rev Log: rpmdb2solv: - add usage() - call repo_add_products differently repo_products: - fallback to parsing /etc/*-release if not products.d directory found Modified: trunk/sat-solver/package/libsatsolver.changes trunk/sat-solver/tools/repo_products.c trunk/sat-solver/tools/repo_products.h trunk/sat-solver/tools/rpmdb2solv.c Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Fri Aug 15 14:28:43 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 15 14:26:29 CEST 2008 - kkaempf(a)suse.de + +- Implement pre-code11 fallback for products, parse /etc/*-release + if /etc/products.d is not available. + +------------------------------------------------------------------- Wed Aug 13 18:06:41 CEST 2008 - kkaempf(a)suse.de - provide installtime for installed products. 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 Fri Aug 15 14:28:43 2008 @@ -25,6 +25,7 @@ #include "pool.h" #include "repo.h" #include "util.h" +#include "tools_util.h" #include "repo_content.h" struct parsedata { @@ -36,60 +37,6 @@ /* - * join up to three strings into one - */ - -static char * -join(struct parsedata *pd, const char *s1, const char *s2, const char *s3) -{ - int l = 1; - char *p; - - if (s1) - l += strlen(s1); - if (s2) - l += strlen(s2); - if (s3) - l += strlen(s3); - if (l > pd->tmpl) - { - pd->tmpl = l + 256; - pd->tmp = sat_realloc(pd->tmp, pd->tmpl); - } - p = pd->tmp; - if (s1) - { - strcpy(p, s1); - p += strlen(s1); - } - if (s2) - { - strcpy(p, s2); - p += strlen(s2); - } - if (s3) - { - strcpy(p, s3); - p += strlen(s3); - } - return pd->tmp; -} - - -/* - * create epoch:version-release as Id - */ - -static Id -makeevr(Pool *pool, char *s) -{ - if (!strncmp(s, "0:", 2) && s[2]) - s += 2; - return str2id(pool, s, 1); -} - - -/* * create localized tag */ @@ -124,7 +71,7 @@ */ static void -repo_add_product(struct parsedata *pd, Repodata *data, FILE *fp) +repo_add_product(struct parsedata *pd, Repodata *data, FILE *fp, int code11) { Repo *repo = pd->repo; Pool *pool = repo->pool; @@ -159,6 +106,42 @@ *--linep = 0; linep = line; + if (!code11) + { + /* non-code11, assume /etc/xyz-release + * just parse first line + * as "<name> <version> (<arch>)" + */ + char *sp[3]; + + if (split(linep, sp, 3) == 3) + { + if (!s) + { + struct stat st; + + s = pool_id2solvable(pool, repo_add_solvable(repo)); + repodata_extend(data, s - pool->solvables); + handle = repodata_get_handle(data, s - pool->solvables - repo->start); + if (!fstat(fileno(fp), &st)) + { + repodata_set_num(data, handle, SOLVABLE_INSTALLTIME, st.st_ctime); + } + else + { + perror("Can't stat()"); + } + } + s->name = str2id(pool, join2("product", ":", sp[0]), 1); + s->evr = makeevr(pool, sp[1]); + } + else + { + fprintf(stderr, "Can't recognize -release line '%s'\n", linep); + } + break; /* just parse single line */ + } + /* * Very trivial .ini parser */ @@ -249,7 +232,7 @@ } } if (!strcmp(key, "name")) - s->name = str2id(pool, join(pd, "product", ":", value), 1); + s->name = str2id(pool, join2("product", ":", value), 1); else if (!strcmp(key, "version")) s->evr = makeevr(pool, value); else if (!strcmp(key, "vendor")) @@ -300,44 +283,82 @@ /* - * read all .prod files from directory - * parse each one as a product + * parse dir looking for files ending in suffix */ -void -repo_add_products(Repo *repo, Repodata *repodata, const char *proddir) +static void +parse_dir(DIR *dir, const char *path, struct parsedata *pd, Repodata *repodata, int code11) { - DIR *dir = opendir(proddir); struct dirent *entry; - struct parsedata pd; - - memset(&pd, 0, sizeof(pd)); - pd.repo = repo; - - if (!dir) - { - perror(proddir); - return; - } + char *suffix = code11 ? ".prod" : "-release"; + int slen = code11 ? 5 : 8; /* strlen(".prod") : strlen("-release") */ while ((entry = readdir(dir))) { - const char *dot; - dot = strrchr( entry->d_name, '.' ); - if (dot && strcmp(dot, ".prod") == 0) + int len; + len = strlen(entry->d_name); + + /* skip /etc/lsb-release, thats not a product per-se */ + if (!code11 + && strcmp(entry->d_name, "lsb-release") == 0) { - char *fullpath = join(&pd, proddir, "/", entry->d_name); + continue; + } + + if (len > slen + && strcmp(entry->d_name+len-slen, suffix) == 0) + { + char *fullpath = join2(path, "/", entry->d_name); FILE *fp = fopen(fullpath, "r"); if (!fp) { perror(fullpath); break; } - repo_add_product(&pd, repodata, fp); + repo_add_product(pd, repodata, fp, code11); fclose(fp); } } +} + + +/* + * read all installed products + * + * try proddir (reading all .prod files from this directory) first + * if not available, assume non-code11 layout and parse /etc/xyz-release + * + * parse each one as a product + */ + +void +repo_add_products(Repo *repo, Repodata *repodata, const char *proddir, const char *root) +{ + const char *fullpath = proddir; + int code11 = 1; + DIR *dir = opendir(fullpath); + struct parsedata pd; + + memset(&pd, 0, sizeof(pd)); + pd.repo = repo; + + if (!dir) + { + fullpath = root ? join2(root, "", "/etc") : "/etc"; + dir = opendir(fullpath); + code11 = 0; + } + if (!dir) + { + perror(fullpath); + } + else + { + parse_dir(dir, fullpath, &pd, repodata, code11); + } + if (pd.tmp) sat_free(pd.tmp); + join_freemem(); closedir(dir); } Modified: trunk/sat-solver/tools/repo_products.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_products.h… ============================================================================== --- trunk/sat-solver/tools/repo_products.h (original) +++ trunk/sat-solver/tools/repo_products.h Fri Aug 15 14:28:43 2008 @@ -5,4 +5,4 @@ * for further information */ -void repo_add_products(Repo *repo, Repodata *repodata, const char *proddir); +void repo_add_products(Repo *repo, Repodata *repodata, const char *proddir, const char *root); Modified: trunk/sat-solver/tools/rpmdb2solv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/rpmdb2solv.c?re… ============================================================================== --- trunk/sat-solver/tools/rpmdb2solv.c (original) +++ trunk/sat-solver/tools/rpmdb2solv.c Fri Aug 15 14:28:43 2008 @@ -12,14 +12,6 @@ * a .solv file of 'installed' solvables. * Writes .solv to stdout * - * Usage: - * rpmdb2solv [-n] [-x] [-b <basefile>] [-p <productsdir>] [-r <root>] - * -n : No packages, do not read rpmdb, useful to only parse products - * -x : use extrapool - * -b <basefile> : Write .solv to <basefile>.solv instead of stdout - * -p <productsdir> : Scan <productsdir> for .prod files, representing installed products - * -r <root> : Prefix rpmdb path and <productsdir> with <root> - * */ #include <sys/types.h> @@ -37,6 +29,21 @@ #include "repo_solv.h" #include "common_write.h" +static void +usage(int status) +{ + fprintf(stderr, "\nUsage:\n" + "rpmdb2solv [-n] [-x] [-b <basefile>] [-p <productsdir>] [-r <root>]\n" + " -n : No packages, do not read rpmdb, useful to only parse products\n" + " -x : use extrapool\n" + " -b <basefile> : Write .solv to <basefile>.solv instead of stdout\n" + " -p <productsdir> : Scan <productsdir> for .prod files, representing installed products\n" + " -r <root> : Prefix rpmdb path and <productsdir> with <root>\n" + ); + exit(status); +} + + int main(int argc, char **argv) { @@ -56,9 +63,12 @@ * parse arguments */ - while ((c = getopt (argc, argv, "nxb:r:p:")) >= 0) + while ((c = getopt (argc, argv, "hnxb:r:p:")) >= 0) switch (c) { + case 'h': + usage(0); + break; case 'r': root = optarg; break; @@ -75,7 +85,7 @@ extrapool = 1; break; default: - exit(1); + usage(1); } /* @@ -134,7 +144,7 @@ } } - repo_add_products(repo, repodata, proddir); + repo_add_products(repo, repodata, proddir, root); } if (repodata) -- 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] r10869 - in /trunk/libzypp/zypp: Package.cc VendorSupportOptions.h
by dmacvicar＠svn.opensuse.org 15 Aug '08

15 Aug '08

Author: dmacvicar Date: Fri Aug 15 13:16:26 2008 New Revision: 10869 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10869&view=rev Log: reorder enum, and implement method Modified: trunk/libzypp/zypp/Package.cc trunk/libzypp/zypp/VendorSupportOptions.h Modified: trunk/libzypp/zypp/Package.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Package.cc?rev=1086… ============================================================================== --- trunk/libzypp/zypp/Package.cc (original) +++ trunk/libzypp/zypp/Package.cc Fri Aug 15 13:16:26 2008 @@ -44,6 +44,22 @@ VendorSupportOption Package::vendorSupport() const { + Keywords kw(keywords()); + + for_( it, kw.begin(), kw.end() ) + { + if ( *it == "support_unsupported") + return VendorSupportUnsupported; + if ( *it == "support_acc") + return VendorSupportACC; + + if ( *it == "support_l1") + return VendorSupportLevel1; + if ( *it == "support_l2") + return VendorSupportLevel2; + if ( *it == "support_l3") + return VendorSupportLevel3; + } return VendorSupportUnknown; } Modified: trunk/libzypp/zypp/VendorSupportOptions.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/VendorSupportOption… ============================================================================== --- trunk/libzypp/zypp/VendorSupportOptions.h (original) +++ trunk/libzypp/zypp/VendorSupportOptions.h Fri Aug 15 13:16:26 2008 @@ -29,6 +29,10 @@ */ VendorSupportUnsupported = 0x0001, /** + * Additional Customer Contract necessary + */ + VendorSupportACC = 0x0002, + /** * Problem determination, which means technical support * designed to provide compatibility information, * installation assistance, usage support, on-going maintenance @@ -37,7 +41,7 @@ * * May have different semantics for different organizations. */ - VendorSupportLevel1 = 0x0002, + VendorSupportLevel1 = 0x0004, /** * Problem isolation, which means technical support designed * to duplicate customer problems, isolate problem area and provide @@ -45,7 +49,7 @@ * * May have different semantics for different organizations. */ - VendorSupportLevel2 = 0x0004, + VendorSupportLevel2 = 0x0008, /** * Problem resolution, which means technical support designed * to resolve complex problems by engaging engineering in resolution @@ -53,11 +57,7 @@ * * May have different semantics for different organizations. */ - VendorSupportLevel3 = 0x0008, - /** - * Additional Customer Contract necessary - */ - VendorSupportACC = 0x0016 + VendorSupportLevel3 = 0x0016 }; // Make a flag set for this -- 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] r10868 - /trunk/libzypp/zypp/VendorSupportOptions.h
by dmacvicar＠svn.opensuse.org 15 Aug '08

15 Aug '08

Author: dmacvicar Date: Fri Aug 15 13:16:25 2008 New Revision: 10868 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10868&view=rev Log: fix Modified: trunk/libzypp/zypp/VendorSupportOptions.h Modified: trunk/libzypp/zypp/VendorSupportOptions.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/VendorSupportOption… ============================================================================== --- trunk/libzypp/zypp/VendorSupportOptions.h (original) +++ trunk/libzypp/zypp/VendorSupportOptions.h Fri Aug 15 13:16:25 2008 @@ -45,7 +45,7 @@ * * May have different semantics for different organizations. */ - VendorSupportLevel2 = 0x0003, + VendorSupportLevel2 = 0x0004, /** * Problem resolution, which means technical support designed * to resolve complex problems by engaging engineering in resolution @@ -53,11 +53,11 @@ * * May have different semantics for different organizations. */ - VendorSupportLevel3 = 0x0004, + VendorSupportLevel3 = 0x0008, /** * Additional Customer Contract necessary */ - VendorSupportACC = 0x0008 + VendorSupportACC = 0x0016 }; // Make a flag set for this -- 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] r10867 - /trunk/libzypp/zypp/solver/detail/SATResolver.cc
by schubi2＠svn.opensuse.org 15 Aug '08

15 Aug '08

Author: schubi2 Date: Fri Aug 15 09:59:04 2008 New Revision: 10867 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10867&view=rev Log: typo Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATRe… ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Fri Aug 15 09:59:04 2008 @@ -897,7 +897,7 @@ break; case SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP: ret = str::form (_("nothing provides requested %s"), dep2str(pool, dep)); - detail += _("Have you enabled all requested repositories ?"); + detail += _("Have you enabled all requested repositories?"); break; case SOLVER_PROBLEM_NOT_INSTALLABLE: s = mapSolvable (source); -- 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] r10866 - in /trunk/libzypp: VERSION.cmake zypp/ResStatus.h zypp/ui/SelectableImpl.cc
by mlandres＠svn.opensuse.org 14 Aug '08

14 Aug '08

Author: mlandres Date: Thu Aug 14 21:58:30 2008 New Revision: 10866 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10866&view=rev Log: Fix Selectable implementation to honour causer. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/zypp/ResStatus.h trunk/libzypp/zypp/ui/SelectableImpl.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=10866&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Thu Aug 14 21:58:30 2008 @@ -61,7 +61,7 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "5") SET(LIBZYPP_MINOR "5") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "2") # # LAST RELEASED: 5.5.1 (5) # (The number in parenthesis is LIBZYPP_COMPATMINOR) Modified: trunk/libzypp/zypp/ResStatus.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResStatus.h?rev=108… ============================================================================== --- trunk/libzypp/zypp/ResStatus.h (original) +++ trunk/libzypp/zypp/ResStatus.h Thu Aug 14 21:58:30 2008 @@ -22,6 +22,7 @@ namespace resstatus { class UserLockQueryManip; + class StatusBackup; } /////////////////////////////////////////////////////////////////// @@ -669,6 +670,7 @@ { return _bitfield.value<_Field>() < val_r; } private: + friend class resstatus::StatusBackup; BitFieldType _bitfield; }; /////////////////////////////////////////////////////////////////// @@ -684,7 +686,32 @@ inline bool operator!=( const ResStatus & lhs, const ResStatus & rhs ) { return ! (lhs == rhs); } - ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + + namespace resstatus + { + class StatusBackup + { + public: + StatusBackup() + : _status( 0 ) + {} + + StatusBackup( ResStatus & status_r ) + : _status( &status_r ) + , _bitfield( _status->_bitfield ) + {} + + void replay() + { if ( _status ) _status->_bitfield = _bitfield; } + + private: + ResStatus * _status; + ResStatus::BitFieldType _bitfield; + }; + } + + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// #endif // ZYPP_RESSTATUS_H Modified: trunk/libzypp/zypp/ui/SelectableImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/SelectableImpl.c… ============================================================================== --- trunk/libzypp/zypp/ui/SelectableImpl.cc (original) +++ trunk/libzypp/zypp/ui/SelectableImpl.cc Thu Aug 14 21:58:30 2008 @@ -35,6 +35,7 @@ : _impl( impl ) , inst( impl.installedObj() ) , cand( impl.candidateObj() ) + , causer( causer_r ) {} typedef Selectable::Impl::available_const_iterator available_const_iterator; @@ -57,103 +58,148 @@ bool hasBoth() const { return inst && cand; } - // - // ResStatus manip - // - void resetTransactingCandidates() const + /** \name Topevel methods must restore status on failure. */ + //@{ + bool setInstall() { - for ( available_const_iterator it = _impl.availableBegin(); - it != _impl.availableEnd(); ++it ) - { - (*it).status().setTransact( false, ResStatus::USER ); + if ( cand ) + { + if ( inst ) { + ResStatus & inststatus( backup( inst.status() ) ); + if ( ! inststatus.setTransact( false, causer ) ) return restore(); + if ( ! inststatus.setLock ( false, causer ) ) return restore(); + if ( ! cand->installOnly() ) + { + // This is what the solver most probabely will do. + // If we are wrong the solver will correct it. But + // this way we will get a better disk usage result, + // even if no autosolving is on. + inststatus.setTransact( true, ResStatus::SOLVER ); + } } + if ( ! unlockCandidates() ) return restore(); + ResStatus & candstatus( backup( cand.status() ) ); + if ( ! candstatus.setTransact( true, causer ) ) return restore(); + return true; + } + return false; } - void unlockCandidates() const + + bool setDelete() { - for ( available_const_iterator it = _impl.availableBegin(); - it != _impl.availableEnd(); ++it ) - { - (*it).status().setTransact( false, ResStatus::USER ); - (*it).status().setLock( false, ResStatus::USER ); - } + if ( inst ) + { + if ( ! resetTransactingCandidates() ) return restore(); + ResStatus & inststatus( backup( inst.status() ) ); + if ( ! inststatus.setLock( false, causer ) ) return restore(); + if ( ! inststatus.setTransact( true, causer ) ) return restore(); + return true; + } + return false; } - void lockCandidates() const + + bool unset() { - for ( available_const_iterator it = _impl.availableBegin(); - it != _impl.availableEnd(); ++it ) - { - (*it).status().setTransact( false, ResStatus::USER ); - (*it).status().setLock( true, ResStatus::USER ); - } + if ( inst ) + { + ResStatus & inststatus( backup( inst.status() ) ); + if ( ! inststatus.setTransact( false, causer ) ) return restore(); + if ( ! inststatus.setLock( false, causer ) ) return restore(); + } + if ( ! unlockCandidates() ) return restore(); + return true; } - bool setInstall() const + bool setProtected() { - if ( cand ) - { - if ( inst ) { - inst.status().setTransact( false, ResStatus::USER ); - inst.status().setLock ( false, ResStatus::USER ); - if ( ! cand->installOnly() ) - { - // This is what the solver most probabely will do. - // If we are wrong the solver will correct it. But - // this way we will get a better disk usage result, - // even if no autosolving is on. - inst.status().setTransact( true, ResStatus::SOLVER ); - } - } - unlockCandidates(); - return cand.status().setTransact( true, ResStatus::USER ); - } - return false; + if ( causer != ResStatus::USER ) // by user only + return false; + + if ( inst ) { + resetTransactingCandidates(); + inst.status().setTransact( false, causer ); + return inst.status().setLock( true, causer ); + } else + return false; } - bool setDelete() const + bool setTaboo() { - if ( inst ) - { - resetTransactingCandidates(); - inst.status().setLock( false, ResStatus::USER ); - return inst.status().setTransact( true, ResStatus::USER ); - } - return false; + if ( causer != ResStatus::USER ) // by user only + return false; + + if ( cand ) { + lockCandidates(); + return true; + } else + return false; } + //@} - bool unset() const + private: + /** \name Helper methods backup status but do not replay. */ + //@{ + bool resetTransactingCandidates() { - if ( inst ) { - inst.status().setTransact( false, ResStatus::USER ); - inst.status().setLock( false, ResStatus::USER ); - } - unlockCandidates(); - return true; + for_( it, _impl.availableBegin(), _impl.availableEnd() ) + { + ResStatus & status( backup( (*it).status() ) ); + if ( ! status.setTransact( false, causer ) ) return false; + } + return true; } - - bool setProtected() const + bool unlockCandidates() { - if ( inst ) { - resetTransactingCandidates(); - inst.status().setTransact( false, ResStatus::USER ); - return inst.status().setLock( true, ResStatus::USER ); - } else - return false; + for_( it, _impl.availableBegin(), _impl.availableEnd() ) + { + ResStatus & status( backup( (*it).status() ) ); + if ( ! status.setTransact( false, causer ) ) return false; + if ( ! status.setLock( false, causer ) ) return false; + } + return true; } + bool lockCandidates() + { + for_( it, _impl.availableBegin(), _impl.availableEnd() ) + { + ResStatus & status( backup( (*it).status() ) ); + if ( ! status.setTransact( false, causer ) ) return false; + if ( ! status.setLock( true, causer ) ) return false; + } + return true; + } + //@} - bool setTaboo() const + private: + const Selectable::Impl & _impl; + PoolItem inst; + PoolItem cand; + ResStatus::TransactByValue causer; + + private: + // No backup replay needed if causer is user, + // because actions should always succeed. + + ResStatus & backup( ResStatus & status_r ) { - if ( cand ) { - lockCandidates(); - return true; - } else - return false; + if ( causer != ResStatus::USER ) + _backup.push_back( status_r ); + return status_r; } + bool restore() + { + if ( causer != ResStatus::USER ) + { + for_( rit, _backup.rbegin(), _backup.rend() ) + { + rit->replay(); + } + } + return false; // restore is done on error - return restore(); + } - public: - const Selectable::Impl & _impl; - PoolItem inst; - PoolItem cand; + std::vector<resstatus::StatusBackup> _backup; }; /////////////////////////////////////////////////////////////////// -- 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] r10865 - in /trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests: 134811288-package.xml.gz 135096824-package.xml.gz product-test.solution product-test.xml
by schubi2＠svn.opensuse.org 14 Aug '08

14 Aug '08

Author: schubi2 Date: Thu Aug 14 18:46:22 2008 New Revision: 10865 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10865&view=rev Log: Regarding error messages for Products correctly (Fate #304502) Added: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/134811288-package.xml.gz (with props) trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/135096824-package.xml.gz (with props) trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/product-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/product-test.xml Added: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/134811288-package.xml.gz URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== Binary file - no diff available. Added: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/135096824-package.xml.gz URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== Binary file - no diff available. Added: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/product-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/product-test.solution (added) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/product-test.solution Thu Aug 14 18:46:22 2008 @@ -0,0 +1,19 @@ +>!> Requesting locale de_DE +>!> Installing openSUSE-release from channel prodtest +>!> Installing test from channel LocalStuff +>!> 1 problems found: +>!> Problem: +>!> test-2-1.i586 conflicts with openSUSE-release = 11.0.42-11 provided by product:openSUSE-11.0.42.noarch +>!> +>!> Solution: +>!> do not install test-2-1.i586 +>!> +>!> Solution: +>!> do not install product:openSUSE-11.0.42.noarch +>!> +>!> Taking solution: 1 +>!> For problem: 0 +>!> No problems so far +>!> No problems so far +>!> Solution : +>!> install test-2-1.i586[LocalStuff] Added: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/product-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/product-test.xml (added) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/product-test.xml Thu Aug 14 18:46:22 2008 @@ -0,0 +1,30 @@ +<?xml version="1.0"?> + +<test> +<setup arch="ia64"> +  + <channel file="134811288-package.xml.gz" name="prodtest" /> + +  + <channel file="135096824-package.xml.gz" name="LocalStuff" /> + + <locale name="de_DE" /> +</setup> +<trial> +<install channel="prodtest" package="openSUSE-release"/> +<install channel="LocalStuff" package="test"/> +<reportproblems/> +<takesolution problem="0" solution="1"/> +<reportproblems/> +</trial> +</test> -- 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] r10864 - /trunk/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 14 Aug '08

14 Aug '08

Author: schubi2 Date: Thu Aug 14 18:45:21 2008 New Revision: 10864 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10864&view=rev Log: Regarding error messages for Products correctly (Fate #304502) 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 Thu Aug 14 18:45:21 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 14 18:44:45 CEST 2008 - schubi(a)suse.de + +- Regarding error messages for Products correctly (FATE #304502) +- rev 10863 + +------------------------------------------------------------------- Thu Aug 14 14:03:27 CEST 2008 - ma(a)suse.de - Let Selectable default to USER level. -- 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] r10863 - in /trunk/libzypp/zypp/solver/detail: SATResolver.cc SATResolver.h
by schubi2＠svn.opensuse.org 14 Aug '08

14 Aug '08

Author: schubi2 Date: Thu Aug 14 18:44:27 2008 New Revision: 10863 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10863&view=rev Log: Regarding error messages for Products correctly (Fate #304502) Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc trunk/libzypp/zypp/solver/detail/SATResolver.h Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATRe… ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Thu Aug 14 18:44:27 2008 @@ -845,6 +845,33 @@ }; +//---------------------------------------------------------------------------- +// Checking if this solvable/item has a buddy which reflect the real +// user visible description of an item +// e.g. The release package has a buddy to the concerning product item. +// This user want's the message "Product foo conflicts with product bar" and +// NOT "package release-foo conflicts with package release-bar" +//---------------------------------------------------------------------------- + + +PoolItem SATResolver::mapItem (const PoolItem &item) +{ + sat::Solvable buddy = item.buddy(); + if (buddy != sat::Solvable()) + { + return _pool.find (buddy); + } + else + { + return item; + } +} + +sat::Solvable SATResolver::mapSolvable (const Id &id) +{ + PoolItem item = _pool.find (sat::Solvable(id)); + return mapItem(item).satSolvable(); +} string SATResolver::SATprobleminfoString(Id problem, string &detail, Id &ignoreId) { @@ -852,15 +879,15 @@ Pool *pool = _solv->pool; Id probr; Id dep, source, target; - Solvable *s, *s2; + sat::Solvable s, s2; ignoreId = 0; probr = solver_findproblemrule(_solv, problem); switch (solver_problemruleinfo(_solv, &(_jobQueue), probr, &dep, &source, &target)) { case SOLVER_PROBLEM_UPDATE_RULE: - s = pool_id2solvable(pool, source); - ret = str::form (_("problem with installed package %s"), solvable2str(pool, s)); + s = mapSolvable (source); + ret = str::form (_("problem with installed package %s"), solvable2str(pool, s.get())); break; case SOLVER_PROBLEM_JOB_RULE: ret = str::form (_("conflicting requests")); @@ -873,35 +900,35 @@ detail += _("Have you enabled all requested repositories ?"); break; case SOLVER_PROBLEM_NOT_INSTALLABLE: - s = pool_id2solvable(pool, source); - ret = str::form (_("%s is not installable"), solvable2str(pool, s)); + s = mapSolvable (source); + ret = str::form (_("%s is not installable"), solvable2str(pool, s.get())); break; case SOLVER_PROBLEM_NOTHING_PROVIDES_DEP: - s = pool_id2solvable(pool, source); - ret = str::form (_("nothing provides %s needed by %s"), dep2str(pool, dep), solvable2str(pool, s)); + s = mapSolvable (source); + ret = str::form (_("nothing provides %s needed by %s"), dep2str(pool, dep), solvable2str(pool, s.get())); break; case SOLVER_PROBLEM_SAME_NAME: - s = pool_id2solvable(pool, source); - s2 = pool_id2solvable(pool, target); - ret = str::form (_("cannot install both %s and %s"), solvable2str(pool, s), solvable2str(pool, s2)); + s = mapSolvable (source); + s2 = mapSolvable (target); + ret = str::form (_("cannot install both %s and %s"), solvable2str(pool, s.get()), solvable2str(pool, s2.get())); break; case SOLVER_PROBLEM_PACKAGE_CONFLICT: - s = pool_id2solvable(pool, source); - s2 = pool_id2solvable(pool, target); - ret = str::form (_("%s conflicts with %s provided by %s"), solvable2str(pool, s), dep2str(pool, dep), solvable2str(pool, s2)); + s = mapSolvable (source); + s2 = mapSolvable (target); + ret = str::form (_("%s conflicts with %s provided by %s"), solvable2str(pool, s.get()), dep2str(pool, dep), solvable2str(pool, s2.get())); break; case SOLVER_PROBLEM_PACKAGE_OBSOLETES: - s = pool_id2solvable(pool, source); - s2 = pool_id2solvable(pool, target); - ret = str::form (_("%s obsoletes %s provided by %s"), solvable2str(pool, s), dep2str(pool, dep), solvable2str(pool, s2)); + s = mapSolvable (source); + s2 = mapSolvable (target); + ret = str::form (_("%s obsoletes %s provided by %s"), solvable2str(pool, s.get()), dep2str(pool, dep), solvable2str(pool, s2.get())); break; case SOLVER_PROBLEM_SELF_CONFLICT: - s = pool_id2solvable(pool, source); - ret = str::form (_("Solvable %s conflicts with %s provided by itself"), solvable2str(pool, s), dep2str(pool, dep)); + s = mapSolvable (source); + ret = str::form (_("Solvable %s conflicts with %s provided by itself"), solvable2str(pool, s.get()), dep2str(pool, dep)); break; case SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE: ignoreId = source; // for setting weak dependencies - s = pool_id2solvable(pool, source); + s = mapSolvable (source); Capability cap(dep); sat::WhatProvides possibleProviders(cap); @@ -929,14 +956,14 @@ } } - ret = str::form (_("%s requires %s, but this requirement cannot be provided"), solvable2str(pool, s), dep2str(pool, dep)); + ret = str::form (_("%s requires %s, but this requirement cannot be provided"), solvable2str(pool, s.get()), dep2str(pool, dep)); if (providerlistInstalled.size() > 0) { detail += _("deleted providers: "); for (ProviderList::const_iterator iter = providerlistInstalled.begin(); iter != providerlistInstalled.end(); iter++) { if (iter == providerlistInstalled.begin()) detail += itemToString (*iter, false); else - detail += "\n " + itemToString (*iter, false); + detail += "\n " + itemToString (mapItem(*iter), false); } } if (providerlistUninstalled.size() > 0) { @@ -948,7 +975,7 @@ if (iter == providerlistUninstalled.begin()) detail += itemToString (*iter, false); else - detail += "\n " + itemToString (*iter, false); + detail += "\n " + itemToString (mapItem(*iter), false); } } break; @@ -966,7 +993,7 @@ int pcnt; Id p, rp, what; Id problem, solution, element; - Solvable *s, *sd; + sat::Solvable s, sd; CapabilitySet system_requires = SystemCheck::instance().requiredSystemCap(); CapabilitySet system_conflicts = SystemCheck::instance().conflictSystemCap(); @@ -995,44 +1022,44 @@ switch (_jobQueue.elements[rp-1]) { case SOLVER_INSTALL_SOLVABLE: { - s = pool->solvables + what; - PoolItem poolItem = _pool.find (sat::Solvable(what)); + s = mapSolvable (what); + PoolItem poolItem = _pool.find (s); if (poolItem) { - if (_solv->installed && s->repo == _solv->installed) { + if (_solv->installed && s.get()->repo == _solv->installed) { problemSolution->addSingleAction (poolItem, REMOVE); - string description = str::form (_("do not keep %s installed"), solvable2str(pool, s) ); + string description = str::form (_("do not keep %s installed"), solvable2str(pool, s.get()) ); MIL << description << endl; problemSolution->addDescription (description); } else { problemSolution->addSingleAction (poolItem, REMOVE); - string description = str::form (_("do not install %s"), solvable2str(pool, s)); + string description = str::form (_("do not install %s"), solvable2str(pool, s.get())); MIL << description << endl; problemSolution->addDescription (description); } } else { - ERR << "SOLVER_INSTALL_SOLVABLE: No item found for " << id2str(pool, s->name) << "-" - << id2str(pool, s->evr) << "." << id2str(pool, s->arch) << endl; + ERR << "SOLVER_INSTALL_SOLVABLE: No item found for " << id2str(pool, s.get()->name) << "-" + << id2str(pool, s.get()->evr) << "." << id2str(pool, s.get()->arch) << endl; } } break; case SOLVER_ERASE_SOLVABLE: { - s = pool->solvables + what; - PoolItem poolItem = _pool.find (sat::Solvable(what)); + s = mapSolvable (what); + PoolItem poolItem = _pool.find (s); if (poolItem) { - if (_solv->installed && s->repo == _solv->installed) { + if (_solv->installed && s.get()->repo == _solv->installed) { problemSolution->addSingleAction (poolItem, KEEP); - string description = str::form (_("keep %s"), solvable2str(pool, s)); + string description = str::form (_("keep %s"), solvable2str(pool, s.get())); MIL << description << endl; problemSolution->addDescription (description); } else { problemSolution->addSingleAction (poolItem, INSTALL); - string description = str::form (_("do not forbid installation of %s"), solvable2str(pool, s)); + string description = str::form (_("do not forbid installation of %s"), solvable2str(pool, s.get())); MIL << description << endl; problemSolution->addDescription (description); } } else { - ERR << "SOLVER_ERASE_SOLVABLE: No item found for " << id2str(pool, s->name) << "-" << id2str(pool, s->evr) << "." << - id2str(pool, s->arch) << endl; + ERR << "SOLVER_ERASE_SOLVABLE: No item found for " << id2str(pool, s.get()->name) << "-" << id2str(pool, s.get()->evr) << "." << + id2str(pool, s.get()->arch) << endl; } } break; @@ -1107,20 +1134,20 @@ break; case SOLVER_INSTALL_SOLVABLE_UPDATE: { - PoolItem poolItem = _pool.find (sat::Solvable(what)); - s = pool->solvables + what; + s = mapSolvable (what); + PoolItem poolItem = _pool.find (s); if (poolItem) { - if (_solv->installed && s->repo == _solv->installed) { + if (_solv->installed && s.get()->repo == _solv->installed) { problemSolution->addSingleAction (poolItem, KEEP); - string description = str::form (_("do not install most recent version of %s"), solvable2str(pool, s)); + string description = str::form (_("do not install most recent version of %s"), solvable2str(pool, s.get())); MIL << description << endl; problemSolution->addDescription (description); } else { ERR << "SOLVER_INSTALL_SOLVABLE_UPDATE " << poolItem << " is not selected for installation" << endl; } } else { - ERR << "SOLVER_INSTALL_SOLVABLE_UPDATE: No item found for " << id2str(pool, s->name) << "-" << id2str(pool, s->evr) << "." << - id2str(pool, s->arch) << endl; + ERR << "SOLVER_INSTALL_SOLVABLE_UPDATE: No item found for " << id2str(pool, s.get()->name) << "-" << id2str(pool, s.get()->evr) << "." << + id2str(pool, s.get()->arch) << endl; } } break; @@ -1131,55 +1158,58 @@ } } else { /* policy, replace p with rp */ - s = pool->solvables + p; - sd = rp ? pool->solvables + rp : 0; + s = mapSolvable (p); + if (rp) + sd = mapSolvable (rp); - PoolItem itemFrom = _pool.find (sat::Solvable(p)); + PoolItem itemFrom = _pool.find (s); if (rp) { int gotone = 0; - PoolItem itemTo = _pool.find (sat::Solvable(rp)); + PoolItem itemTo = _pool.find (sd); if (itemFrom && itemTo) { problemSolution->addSingleAction (itemTo, INSTALL); - if (evrcmp(pool, s->evr, sd->evr, EVRCMP_COMPARE ) > 0) + if (evrcmp(pool, s.get()->evr, sd.get()->evr, EVRCMP_COMPARE ) > 0) { - string description = str::form (_("downgrade of %s to %s"), solvable2str(pool, s), solvable2str(pool, sd)); + string description = str::form (_("downgrade of %s to %s"), solvable2str(pool, s.get()), solvable2str(pool, sd.get())); MIL << description << endl; problemSolution->addDescription (description); gotone = 1; } - if (!_solv->allowarchchange && s->name == sd->name && s->arch != sd->arch && policy_illegal_archchange(_solv, s, sd)) + if (!_solv->allowarchchange && s.get()->name == sd.get()->name && s.get()->arch != sd.get()->arch + && policy_illegal_archchange(_solv, s.get(), sd.get())) { - string description = str::form (_("architecture change of %s to %s"), solvable2str(pool, s), solvable2str(pool, sd)); + string description = str::form (_("architecture change of %s to %s"), solvable2str(pool, s.get()), solvable2str(pool, sd.get())); MIL << description << endl; problemSolution->addDescription (description); gotone = 1; } - if (!_solv->allowvendorchange && s->name == sd->name && s->vendor != sd->vendor && policy_illegal_vendorchange(_solv, s, sd)) + if (!_solv->allowvendorchange && s.get()->name == sd.get()->name && s.get()->vendor != sd.get()->vendor + && policy_illegal_vendorchange(_solv, s.get(), sd.get())) { string description = str::form (_("install %s (with vendor change)\n %s\n-->\n %s") , - solvable2str(pool, sd) , id2str(pool, s->vendor), - string(sd->vendor ? id2str(pool, sd->vendor) : " (no vendor) ").c_str() ); + solvable2str(pool, sd.get()) , id2str(pool, s.get()->vendor), + string(sd.get()->vendor ? id2str(pool, sd.get()->vendor) : " (no vendor) ").c_str() ); MIL << description << endl; problemSolution->addDescription (description); gotone = 1; } if (!gotone) { - string description = str::form (_("replacement of %s with %s"), solvable2str(pool, s), solvable2str(pool, sd)); + string description = str::form (_("replacement of %s with %s"), solvable2str(pool, s.get()), solvable2str(pool, sd.get())); MIL << description << endl; problemSolution->addDescription (description); } } else { - ERR << id2str(pool, s->name) << "-" << id2str(pool, s->evr) << "." << id2str(pool, s->arch) - << " or " << id2str(pool, sd->name) << "-" << id2str(pool, sd->evr) << "." << id2str(pool, sd->arch) << " not found" << endl; + ERR << id2str(pool, s.get()->name) << "-" << id2str(pool, s.get()->evr) << "." << id2str(pool, s.get()->arch) + << " or " << id2str(pool, sd.get()->name) << "-" << id2str(pool, sd.get()->evr) << "." << id2str(pool, sd.get()->arch) << " not found" << endl; } } else { if (itemFrom) { - string description = str::form (_("deinstallation of %s"), solvable2str(pool, s)); + string description = str::form (_("deinstallation of %s"), solvable2str(pool, s.get())); MIL << description << endl; problemSolution->addDescription (description); problemSolution->addSingleAction (itemFrom, REMOVE); Modified: trunk/libzypp/zypp/solver/detail/SATResolver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATRe… ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.h (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.h Thu Aug 14 18:44:27 2008 @@ -101,6 +101,15 @@ void setLocks(); // set requirements for a running system void setSystemRequirements(); + + // Checking if this solvable/item has a buddy which reflect the real + // user visible description of an item + // e.g. The release package has a buddy to the concerning product item. + // This user want's the message "Product foo conflicts with product bar" and + // NOT "package release-foo conflicts with package release-bar" + // So these functions return the concerning buddy (e.g. product item) + sat::Solvable mapSolvable (const Id &id); + PoolItem mapItem (const PoolItem &item); public: -- 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] r10862 - in /trunk/libzypp/zypp: ResObject.cc ResObject.h
by mlandres＠svn.opensuse.org 14 Aug '08

14 Aug '08

Author: mlandres Date: Thu Aug 14 18:25:24 2008 New Revision: 10862 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10862&view=rev Log: provide ResObject::distribution Modified: trunk/libzypp/zypp/ResObject.cc trunk/libzypp/zypp/ResObject.h Modified: trunk/libzypp/zypp/ResObject.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResObject.cc?rev=10… ============================================================================== --- trunk/libzypp/zypp/ResObject.cc (original) +++ trunk/libzypp/zypp/ResObject.cc Thu Aug 14 18:25:24 2008 @@ -70,6 +70,9 @@ std::string ResObject::licenseToConfirm( const Locale & lang_r ) const { return lookupStrAttribute( sat::SolvAttr::eula, lang_r ); } + std::string ResObject::distribution() const + { return lookupStrAttribute( sat::SolvAttr::distribution ); } + ByteCount ResObject::installSize() const { return ByteCount( lookupNumAttribute( sat::SolvAttr::installsize ), ByteCount::K ); } Modified: trunk/libzypp/zypp/ResObject.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResObject.h?rev=108… ============================================================================== --- trunk/libzypp/zypp/ResObject.h (original) +++ trunk/libzypp/zypp/ResObject.h Thu Aug 14 18:25:24 2008 @@ -103,11 +103,16 @@ /** * \short Vendor * - * For Example "Novell Inc." + * For example "Novell Inc." */ Vendor vendor() const { return Resolvable::vendor().asString(); } + /** The distribution string. + * E.g. \c code-11. + */ + std::string distribution() const; + /** Installed size. */ ByteCount installSize() const; /** \deprecated Use installSize which is more precise.*/ -- 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] r10861 - in /trunk/libzypp/zypp: Product.cc Product.h
by mlandres＠svn.opensuse.org 14 Aug '08

14 Aug '08

Author: mlandres Date: Thu Aug 14 18:24:34 2008 New Revision: 10861 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10861&view=rev Log: support buddies in solver testcases Modified: trunk/libzypp/zypp/Product.cc trunk/libzypp/zypp/Product.h Modified: trunk/libzypp/zypp/Product.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Product.cc?rev=1086… ============================================================================== --- trunk/libzypp/zypp/Product.cc (original) +++ trunk/libzypp/zypp/Product.cc Thu Aug 14 18:24:34 2008 @@ -79,7 +79,17 @@ { Capability identCap( lookupStrAttribute( sat::SolvAttr::productReferences ) ); if ( ! identCap ) + { + // No 'references': fallback to provider of 'product(name) = version' + // Without this solver testcase won't work, as it does not remember + // 'references'. + identCap = Capability( str::form( "product(%s) = %s", name().c_str(), edition().c_str() ) ); + } + if ( ! identCap ) + { return sat::Solvable::noSolvable; + } + // if there is productReferences defined, we expect // a matching package within the same repo. @@ -94,6 +104,9 @@ return sat::Solvable::noSolvable; } + std::string Product::shortName() const + { return lookupStrAttribute( sat::SolvAttr::productShortlabel ); } + std::string Product::flavor() const { return lookupStrAttribute( sat::SolvAttr::productFlavor ); } @@ -137,12 +150,6 @@ return ret; } - std::string Product::shortName() const - { return lookupStrAttribute( sat::SolvAttr::productShortlabel ); } - - std::string Product::longName( const Locale & lang_r ) const - { return summary( lang_r ); } - std::string Product::distributionName() const { return lookupStrAttribute( sat::SolvAttr::productDistproduct ); } Modified: trunk/libzypp/zypp/Product.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Product.h?rev=10861… ============================================================================== --- trunk/libzypp/zypp/Product.h (original) +++ trunk/libzypp/zypp/Product.h Thu Aug 14 18:24:34 2008 @@ -44,11 +44,18 @@ sat::Solvable referencePackage() const; public: - /** The product flavor (LiveCD Demo, FTP edition,...).*/ + /** Untranslated short name like <tt>SLES 10</tt>*/ + std::string shortName() const; + + /** The product flavor (LiveCD Demo, FTP edition,...). */ std::string flavor() const; - /** Get the product type (base, add-on) */ - std::string type() const ZYPP_DEPRECATED; + /** Get the product type (base, add-on) + * Well, in an ideal world there is only one base product. + * It's the installed product denoted by a symlink in + * \c /etc/products.d. + */ + std::string type() const; /** The URL to download the release notes for this product */ Url releaseNotesUrl() const; @@ -75,16 +82,20 @@ /** The product flags */ std::list<std::string> flags() const; - /** Untranslated short name like <tt>SLES 10</tt>*/ - std::string shortName() const; - - /** Translated long name like <tt>SUSE Linux Enterprise Server 10</tt>*/ - std::string longName( const Locale & lang_r = Locale() ) const ZYPP_DEPRECATED; + /** Translated long name like <tt>SUSE Linux Enterprise Server 10</tt> + * \deprecated use summary. + */ + std::string longName( const Locale & lang_r = Locale() ) const ZYPP_DEPRECATED + { return summary( lang_r ); } - /** Vendor specific distribution id. */ + /** Vendor specific distribution id. + * \deprecated replaced by ResObject::distribution + */ std::string distributionName() const ZYPP_DEPRECATED; - /** Vendor specific distribution version. */ + /** Vendor specific distribution version. + * \deprecated replaced by ResObject::distribution + */ Edition distributionEdition() const ZYPP_DEPRECATED; protected: -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0