February 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r8433 - /trunk/libzypp/package/libzypp.changes
by jkupec＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: jkupec Date: Fri Feb 1 17:46:57 2008 New Revision: 8433 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8433&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 Fri Feb 1 17:46:57 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 1 17:45:07 CET 2008 - jkupec(a)suse.cz + +- fixed renaming a repo to an existing one (bnc #228216) +- revision 8431 + +------------------------------------------------------------------- Thu Jan 24 18:26:47 CET 2008 - jkupec(a)suse.cz - read .curlrc more robustly to obtain user-proxy (#330351) -- 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] r8432 - in /branches/tmp/ma/jump_sat/libzypp/zypp/base: String.cc String.h
by mlandres＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: mlandres Date: Fri Feb 1 17:45:51 2008 New Revision: 8432 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8432&view=rev Log: improve some string helper Modified: branches/tmp/ma/jump_sat/libzypp/zypp/base/String.cc branches/tmp/ma/jump_sat/libzypp/zypp/base/String.h Modified: branches/tmp/ma/jump_sat/libzypp/zypp/base/String.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/base/String.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/base/String.cc Fri Feb 1 17:45:51 2008 @@ -57,7 +57,7 @@ ** FUNCTION NAME : strToTrue ** FUNCTION TYPE : bool */ - bool strToTrue( const std::string & str ) + bool strToTrue( const C_Str & str ) { std::string t( toLower( str ) ); return( t == "1" @@ -72,7 +72,7 @@ ** FUNCTION NAME : strToFalse ** FUNCTION TYPE : bool */ - bool strToFalse( const std::string & str ) + bool strToFalse( const C_Str & str ) { std::string t( toLower( str ) ); return ! ( t == "0" Modified: branches/tmp/ma/jump_sat/libzypp/zypp/base/String.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/base/String.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/base/String.h Fri Feb 1 17:45:51 2008 @@ -21,6 +21,74 @@ /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// + + /** Convenience \c char* constructible from \c std::string and \c char*, + * it maps \c (char*)0 to an empty string. + * + * \code + * bool hasPrefix( const std::string & str_r, const std::string & prefix_r ) + * { return( ::strncmp( str_r.c_str(), prefix_r.c_str(), prefix_r.size() ) == 0 ); } + * \endcode + * + * Called with a plain \c char* as argument, the \c std::string is created form + * for nothing. The implementation actually does not use the \c std::string. + * + * Best would be to implement \c hasPrefix for each combination of \c char* + * and \c std::string arguments: + * + * \code + * bool hasPrefix( const std::string & str_r, const std::string & prefix_r ) + * { return( ::strncmp( str_r.c_str(), prefix_r.c_str(), prefix_r.size() ) == 0 ); } + * + * bool hasPrefix( const std::string & str_r, const char * prefix_r ) + * { return( !prefix_r || ::strncmp( str_r.c_str(), prefix_r, ::strlen(prefix_r) ) == 0 ); } + * + * bool hasPrefix( const char * str_r, const std::string & prefix_r ) + * { return( str_r ? ::strncmp( str_r, prefix_r.c_str(), prefix_r.size() ) == 0 : prefix_r.empty() ); } + * + * bool hasPrefix( const char * str_r, const char * prefix_r ) + * { return( str && prefix_r ? ::strncmp( str_r, prefix_r, ::strlen(prefix_r) ) == 0 + * : !((str_r && *str_r) || (prefix_r && *prefix_r)); } + * \endcode + * + * This is where \ref C_Str can help. Constructible from \c std::string and \c char*, + * it \e reduces the \c std::string to it's \c char*. At the same time it converts + * \c (char*)0 into an \c "" string. + * + * \code + * bool hasPrefix( const C_Str & str_r, const C_Str & prefix_r ) + * { return( ::strncmp( str_r, prefix_r, prefix_r.size() ) == 0 ); } + * \endcode + */ + class C_Str + { + public: + typedef std::string::size_type size_type; + + public: + C_Str() : _val( 0 ), _sze( 0 ) {} + C_Str( char * c_str_r ) : _val( c_str_r ), _sze( std::string::npos ) {} + C_Str( const char * c_str_r ) : _val( c_str_r ), _sze( std::string::npos ) {} + C_Str( const std::string & str_r ) : _val( str_r.c_str() ), _sze( str_r.size() ) {} + + public: + bool isNull() const { return !_val; } + bool empty() const { return !(_val && *_val); } + size_type size() const + { + if ( _sze == std::string::npos ) + { _sze = _val ? ::strlen( _val ) : 0; } + return _sze; + }; + + operator const char *() const { return c_str(); } + const char * c_str() const { return _val ? _val : ""; } + + private: + const char *const _val; + mutable size_type _sze; + }; + /////////////////////////////////////////////////////////////////// /** String related utilities and \ref ZYPP_STR_REGEX. \see \ref ZYPP_STR_REGEX @@ -165,25 +233,25 @@ * \endcode */ template<typename _It> - _It strtonum( const std::string & str ); + _It strtonum( const C_Str & str ); template<> - inline short strtonum( const std::string & str ) { return ::strtol ( str.c_str(), NULL, 0 ); } + inline short strtonum( const C_Str & str ) { return ::strtol ( str, NULL, 0 ); } template<> - inline int strtonum( const std::string & str ) { return ::strtol ( str.c_str(), NULL, 0 ); } + inline int strtonum( const C_Str & str ) { return ::strtol ( str, NULL, 0 ); } template<> - inline long strtonum( const std::string & str ) { return ::strtol ( str.c_str(), NULL, 0 ); } + inline long strtonum( const C_Str & str ) { return ::strtol ( str, NULL, 0 ); } template<> - inline long long strtonum( const std::string & str ) { return ::strtoll ( str.c_str(), NULL, 0 ); } + inline long long strtonum( const C_Str & str ) { return ::strtoll ( str, NULL, 0 ); } template<> - inline unsigned short strtonum( const std::string & str ) { return ::strtoul ( str.c_str(), NULL, 0 ); } + inline unsigned short strtonum( const C_Str & str ) { return ::strtoul ( str, NULL, 0 ); } template<> - inline unsigned strtonum( const std::string & str ) { return ::strtoul ( str.c_str(), NULL, 0 ); } + inline unsigned strtonum( const C_Str & str ) { return ::strtoul ( str, NULL, 0 ); } template<> - inline unsigned long strtonum( const std::string & str ) { return ::strtoul ( str.c_str(), NULL, 0 ); } + inline unsigned long strtonum( const C_Str & str ) { return ::strtoul ( str, NULL, 0 ); } template<> - inline unsigned long long strtonum( const std::string & str ) { return ::strtoull( str.c_str(), NULL, 0 ); } + inline unsigned long long strtonum( const C_Str & str ) { return ::strtoull( str, NULL, 0 ); } /** String to integer type detemined 2nd function arg \a i. * \code @@ -191,7 +259,7 @@ * \endcode */ template<typename _It> - inline _It strtonum( const std::string & str, _It & i ) + inline _It strtonum( const C_Str & str, _It & i ) { return i = strtonum<_It>( str ); } //@} @@ -200,16 +268,16 @@ */ //@{ /** Return \c true if str is <tt>1, true, yes, on</tt>. */ - bool strToTrue( const std::string & str ); + bool strToTrue( const C_Str & str ); /** Return \c false if str is <tt>0, false, no, off</tt>. */ - bool strToFalse( const std::string & str ); + bool strToFalse( const C_Str & str ); /** Parse \c str into a bool depending on the default value. * If the \c default is true, look for a legal \c false string. * If the \c default is false, look for a legal \c true string. */ - inline bool strToBool( const std::string & str, bool default_r ) + inline bool strToBool( const C_Str & str, bool default_r ) { return( default_r ? strToFalse( str ) : strToTrue( str ) ); } //@} @@ -226,25 +294,25 @@ * */ template<class _OutputIterator> - unsigned split( const std::string & line_r, - _OutputIterator result_r, - const std::string & sepchars_r = " \t" ) + unsigned split( const C_Str & line_r, + _OutputIterator result_r, + const C_Str & sepchars_r = " \t" ) { - const char * beg = line_r.c_str(); + const char * beg = line_r; const char * cur = beg; // skip leading sepchars - while ( sepchars_r.find( *cur ) != std::string::npos ) + while ( ::strchr( sepchars_r, *cur ) ) ++cur; unsigned ret = 0; for ( beg = cur; *beg; beg = cur, ++result_r, ++ret ) { // skip non sepchars - while( *cur && sepchars_r.find( *cur ) == std::string::npos ) + while( *cur && !::strchr( sepchars_r, *cur ) ) ++cur; // build string *result_r = std::string( beg, cur-beg ); // skip sepchars - while ( cur != beg && sepchars_r.find( *cur ) != std::string::npos ) + while ( cur != beg && ::strchr( sepchars_r, *cur ) ) ++cur; } return ret; @@ -257,7 +325,7 @@ /** Join strings using separator \a sep_r (defaults to BLANK). */ template <class _Iterator> std::string join( _Iterator begin, _Iterator end, - const std::string & sep_r = " " ) + const C_Str & sep_r = " " ) { std::string res; for ( _Iterator iter = begin; iter != end; ++ iter ) @@ -272,7 +340,7 @@ /** Join strings using separator \a sep_r (defaults to BLANK). */ template <class _Container> std::string join( const _Container & cont_r, - const std::string & sep_r = " " ) + const C_Str & sep_r = " " ) { return join( cont_r.begin(), cont_r.end(), sep_r ); } //@} @@ -300,20 +368,12 @@ /** \name Case insensitive comparison. */ //@{ - inline int compareCI( const char * lhs, const char * rhs ) + inline int compareCI( const C_Str & lhs, const C_Str & rhs ) { if ( lhs == rhs ) return 0; - if ( ! ( lhs && rhs ) ) - return( lhs ? 1 : -1 ); return ::strcasecmp( lhs, rhs ); } - inline int compareCI( const std::string & lhs, const std::string & rhs ) - { return compareCI( lhs.c_str(), rhs.c_str() ); } - inline int compareCI( const char * lhs, const std::string & rhs ) - { return compareCI( lhs, rhs.c_str() ); } - inline int compareCI( const std::string & lhs, const char * rhs ) - { return compareCI( lhs.c_str(), rhs ); } //@} /////////////////////////////////////////////////////////////////// @@ -329,7 +389,7 @@ TRIM = (L_TRIM|R_TRIM) }; - std::string trim( const std::string & s, const Trim trim_r = TRIM ); + std::string trim( const std::string & s, const Trim trim_r = TRIM ); inline std::string ltrim( const std::string & s ) { return trim( s, L_TRIM ); } @@ -361,13 +421,13 @@ /** \name String prefix handling. */ //@{ - /** Return whether \a str_r has prefix \a prefix_r. */ - inline bool hasPrefix( const std::string & str_r, const std::string & prefix_r ) - { return( str_r.substr( 0, prefix_r.size() ) == prefix_r ); } + /** Return whether \a str_r has prefix \a prefix_r. */ + inline bool hasPrefix( const C_Str & str_r, const C_Str & prefix_r ) + { return( ::strncmp( str_r, prefix_r, prefix_r.size() ) == 0 ); } /** Strip a \a prefix_r from \a str_r and return the resulting string. */ - inline std::string stripPrefix( const std::string & str_r, const std::string & prefix_r ) - { return( hasPrefix( str_r, prefix_r ) ? str_r.substr( prefix_r.size() ) : str_r ); } + inline std::string stripPrefix( const C_Str & str_r, const C_Str & prefix_r ) + { return( hasPrefix( str_r, prefix_r ) ? str_r + prefix_r.size() : str_r.c_str() ); } //@} ///////////////////////////////////////////////////////////////// } // namespace str -- 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] r8431 - in /trunk/libzypp/zypp: RepoManager.cc RepoManager.h
by jkupec＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: jkupec Date: Fri Feb 1 17:45:00 2008 New Revision: 8431 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8431&view=rev Log: - fixed renaming a repo to an existing one (bnc #228216) Modified: trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/RepoManager.h Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=… ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Fri Feb 1 17:45:00 2008 @@ -1114,6 +1114,19 @@ { RepoInfo toedit = getRepositoryInfo(alias); + // check if the new alias already exists when renaming the repo + if (alias != newinfo.alias()) + { + std::list<RepoInfo> repos = knownRepositories(); + for ( std::list<RepoInfo>::const_iterator it = repos.begin(); + it != repos.end(); + ++it ) + { + if ( newinfo.alias() == (*it).alias() ) + ZYPP_THROW(RepoAlreadyExistsException(newinfo.alias())); + } + } + if (toedit.filepath().empty()) { ZYPP_THROW(RepoException("Can't figure where the repo is stored")); Modified: trunk/libzypp/zypp/RepoManager.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.h?rev=8… ============================================================================== --- trunk/libzypp/zypp/RepoManager.h (original) +++ trunk/libzypp/zypp/RepoManager.h Fri Feb 1 17:45:00 2008 @@ -325,6 +325,8 @@ /** * \short Modify repository attributes * + * \throws RepoAlreadyExistsException if the alias specified in newinfo + * is already used by another repository * \throws RepoNotFoundException If no repo match * \throws ParseException If the file parsing fails * \throws Exception On other errors. -- 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] r8430 - in /trunk/sat-solver/tools: TODO repo_rpmmd.c repo_susetags.c tools_util.h
by dmacvicar＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: dmacvicar Date: Fri Feb 1 10:11:41 2008 New Revision: 8430 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8430&view=rev Log: trying to get a translated attribute working Modified: trunk/sat-solver/tools/TODO trunk/sat-solver/tools/repo_rpmmd.c trunk/sat-solver/tools/repo_susetags.c trunk/sat-solver/tools/tools_util.h Modified: trunk/sat-solver/tools/TODO URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/TODO?rev=8430&r… ============================================================================== --- trunk/sat-solver/tools/TODO (original) +++ trunk/sat-solver/tools/TODO Fri Feb 1 10:11:41 2008 @@ -1,4 +1,4 @@ dmacvicar TODO - xml metadata: prereq for store - +- what do do with capability kind=atom? need to transform it 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 Feb 1 10:11:41 2008 @@ -30,12 +30,40 @@ STATE_ARCH, STATE_VERSION, + /* resobject attributes */ STATE_SUMMARY, STATE_DESCRIPTION, - - STATE_FORMAT, + STATE_INSNOTIFY, + STATE_DELNOTIFY, STATE_VENDOR, + STATE_SIZE, + STATE_DOWNLOADSIZE, + STATE_INSTALLTIME, + STATE_INSTALLONLY, + + /* patch */ + STATE_ID, + STATE_TIMESTAMP, + STATE_AFFECTSPKG, + STATE_REBOOTNEEDED, + // xml store pattern attributes + STATE_CATEGORY, /* pattern and patches */ + STATE_SCRIPT, + STATE_ICON, + STATE_USERVISIBLE, + STATE_DEFAULT, + STATE_INSTALL_TIME, + + /* product */ + STATE_SHORTNAME, + STATE_DISTNAME, + STATE_DISTEDITION, + STATE_SOURCE, + STATE_RELNOTESURL, + + STATE_FORMAT, + /* rpm-md dependencies inside the format tag */ STATE_PROVIDES, @@ -81,18 +109,11 @@ STATE_CAP_ENHANCES, STATE_FILE, - // xml store pattern attributes - STATE_SCRIPT, - STATE_ICON, - STATE_USERVISIBLE, - STATE_CATEGORY, - STATE_DEFAULT, - STATE_INSTALL_TIME, + // general NUMSTATES }; - struct stateswitch { enum state from; char *ename; @@ -112,11 +133,19 @@ { STATE_SOLVABLE, "name", STATE_NAME, 1 }, { STATE_SOLVABLE, "arch", STATE_ARCH, 1 }, { STATE_SOLVABLE, "version", STATE_VERSION, 0 }, - { STATE_SOLVABLE, "vendor", STATE_VENDOR, 1 }, + + /* resobject attributes */ { STATE_SOLVABLE, "summary", STATE_SUMMARY, 1 }, { STATE_SOLVABLE, "description", STATE_DESCRIPTION, 1 }, - + //{ STATE_SOLVABLE, "???", STATE_INSNOTIFY, 1 }, + //{ STATE_SOLVABLE, "??", STATE_DELNOTIFY, 1 }, + { STATE_SOLVABLE, "vendor", STATE_VENDOR, 1 }, + { STATE_SOLVABLE, "size", STATE_SIZE, 1 }, + { STATE_SOLVABLE, "archive-size", STATE_DOWNLOADSIZE, 1 }, + { STATE_SOLVABLE, "install-time", STATE_INSTALLTIME, 1 }, + { STATE_SOLVABLE, "install-only", STATE_INSTALLONLY, 1 }, + // xml store pattern attributes { STATE_SOLVABLE, "script", STATE_SCRIPT, 1 }, { STATE_SOLVABLE, "icon", STATE_ICON, 1 }, @@ -531,6 +560,7 @@ case STATE_SUMMARY: case STATE_DESCRIPTION: pd->lang = find_attr("lang", atts); + //repodata_set_tstr( pd->data, pd- break; default: break; @@ -673,6 +703,10 @@ } pd.common.pool = pool; pd.common.repo = repo; + + pd.data = repo_add_repodata(repo); + init_attr_ids(pool); + pd.content = sat_malloc(256); pd.acontent = 256; pd.lcontent = 0; 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 Fri Feb 1 10:11:41 2008 @@ -79,25 +79,6 @@ #if 0 Attrstore *attr; #endif -static Id id_authors; -static Id id_description; -static Id id_diskusage; -static Id id_downloadsize; -static Id id_eula; -static Id id_group; -static Id id_installsize; -static Id id_keywords; -static Id id_license; -static Id id_messagedel; -static Id id_messageins; -static Id id_mediadir; -static Id id_mediafile; -static Id id_medianr; -static Id id_nosource; -static Id id_source; -static Id id_sourceid; -static Id id_summary; -static Id id_time; static void add_location(struct parsedata *pd, char *line, Solvable *s, unsigned entry) @@ -388,25 +369,7 @@ attr = new_store(pool); #endif data = repo_add_repodata(repo); - id_authors = str2id (pool, "authors", 1); - id_description = str2id (pool, "description", 1); - id_diskusage = str2id (pool, "diskusage", 1); - id_downloadsize = str2id (pool, "downloadsize", 1); - id_eula = str2id (pool, "eula", 1); - id_group = str2id (pool, "group", 1); - id_installsize = str2id (pool, "installsize", 1); - id_keywords = str2id (pool, "keywords", 1); - id_license = str2id (pool, "license", 1); - id_messagedel = str2id (pool, "messagedel", 1); - id_messageins = str2id (pool, "messageins", 1); - id_mediadir = str2id (pool, "mediadir", 1); - id_mediafile = str2id (pool, "mediafile", 1); - id_medianr = str2id (pool, "medianr", 1); - id_nosource = str2id (pool, "nosource", 1); - id_source = str2id (pool, "source", 1); - id_sourceid = str2id (pool, "sourceid", 1); - id_summary = str2id (pool, "summary", 1); - id_time = str2id (pool, "time", 1); + init_attr_ids(pool); } #endif Modified: trunk/sat-solver/tools/tools_util.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tools_util.h?re… ============================================================================== --- trunk/sat-solver/tools/tools_util.h (original) +++ trunk/sat-solver/tools/tools_util.h Fri Feb 1 10:11:41 2008 @@ -14,6 +14,9 @@ #ifndef SATSOLVER_TOOLS_UTIL_H #define SATSOLVER_TOOLS_UTIL_H +static char *_join_tmp; +static int _join_tmpl; + struct parsedata_common { char *tmp; int tmpl; @@ -52,6 +55,46 @@ return i; } +/* this join does not depend on parsedata */ +static char * +join2(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 > _join_tmpl) + { + _join_tmpl = l + 256; + if (!_join_tmp) + _join_tmp = malloc(_join_tmpl); + else + _join_tmp = realloc(_join_tmp, _join_tmpl); + } + p = _join_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 _join_tmp; +} + static char * join(struct parsedata_common *pd, const char *s1, const char *s2, const char *s3) { @@ -91,5 +134,72 @@ return pd->tmp; } +// packages +static Id id_authors; +static Id id_description; +static Id id_diskusage; +static Id id_eula; +static Id id_group; +static Id id_installsize; +static Id id_keywords; +static Id id_license; +static Id id_messagedel; +static Id id_messageins; +static Id id_mediadir; +static Id id_mediafile; +static Id id_medianr; +static Id id_nosource; +static Id id_source; +static Id id_sourceid; +static Id id_time; + +/* resobject */ +static Id id_summary; +static Id id_description; +// static Id id_insnotify; +// static Id id_delnotify; +static Id id_size; +static Id id_downloadsize; +static Id id_installtime; +static Id id_installonly; + +static void init_attr_ids(Pool *pool) +{ + id_size = str2id(pool, "size", 1);; + id_downloadsize = str2id(pool, "downloadsize", 1);; + id_installtime = str2id(pool, "installtime", 1);; + id_installonly = str2id(pool, "installonly", 1);; + id_summary = str2id(pool, "summary", 1); + + // package + id_authors = str2id(pool, "authors", 1); + id_summary = str2id(pool, "summary", 1); + id_description = str2id(pool, "description", 1); + id_diskusage = str2id(pool, "diskusage", 1); + id_downloadsize = str2id(pool, "downloadsize", 1); + id_eula = str2id(pool, "eula", 1); + id_group = str2id(pool, "group", 1); + id_installsize = str2id(pool, "installsize", 1); + id_keywords = str2id(pool, "keywords", 1); + id_license = str2id(pool, "license", 1); + id_messagedel = str2id(pool, "messagedel", 1); + id_messageins = str2id(pool, "messageins", 1); + id_mediadir = str2id(pool, "mediadir", 1); + id_mediafile = str2id(pool, "mediafile", 1); + id_medianr = str2id(pool, "medianr", 1); + id_nosource = str2id(pool, "nosource", 1); + id_source = str2id(pool, "source", 1); + id_sourceid = str2id(pool, "sourceid", 1); + id_time = str2id(pool, "time", 1); +} + +/* util function to set a translated string */ +void repodata_set_tstr(Repodata *data, Id rid, const char *attrname, const char *lang, const char *str) +{ + Id attrid; + attrid = str2id(data->repo->pool, join2( attrname, ":", lang), 1); + repodata_set_str(data, rid, attrid, str); +} + #endif -- 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] r8429 - in /trunk/sat-solver/tools: repo_rpmmd.c repo_susetags.c
by dmacvicar＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: dmacvicar Date: Fri Feb 1 10:11:35 2008 New Revision: 8429 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8429&view=rev Log: - unify join and makeevr Modified: trunk/sat-solver/tools/repo_rpmmd.c trunk/sat-solver/tools/repo_susetags.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 Feb 1 10:11:35 2008 @@ -35,6 +35,9 @@ STATE_FORMAT, STATE_VENDOR, + + /* rpm-md dependencies inside the + format tag */ STATE_PROVIDES, STATE_REQUIRES, STATE_OBSOLETES, @@ -186,6 +189,7 @@ enum state sbtab[NUMSTATES]; const char *lang; const char *capkind; + Repodata *data; }; static char *flagtabnum[] = { 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 Fri Feb 1 10:11:35 2008 @@ -17,34 +17,14 @@ #if 0 #include "attr_store.h" #endif +#include "tools_util.h" #include "repo_susetags.h" -static int -split(char *l, char **sp, int m) -{ - int i; - for (i = 0; i < m;) - { - while (*l == ' ') - l++; - if (!*l) - break; - sp[i++] = l; - while (*l && *l != ' ') - l++; - if (!*l) - break; - *l++ = 0; - } - return i; -} - struct parsedata { char *kind; Repo *repo; Repodata *data; - char *tmp; - int tmpl; + struct parsedata_common common; char **sources; int nsources; int last_found_source; @@ -54,14 +34,6 @@ int ndirs; }; -static Id -makeevr(Pool *pool, char *s) -{ - if (!strncmp(s, "0:", 2) && s[2]) - s += 2; - return str2id(pool, s, 1); -} - static char *flagtab[] = { ">", "=", @@ -71,47 +43,8 @@ "<=" }; -static char * -join(struct parsedata *pd, char *s1, char *s2, 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; - if (!pd->tmp) - pd->tmp = malloc(pd->tmpl); - else - pd->tmp = 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; -} - static unsigned int -adddep(Pool *pool, struct parsedata *pd, unsigned int olddeps, char *line, Id marker, char *kind) +adddep(Pool *pool, struct parsedata_common *pd, unsigned int olddeps, char *line, Id marker, char *kind) { int i, flags; Id id, evrid; @@ -583,10 +516,10 @@ exit(1); } if (pd.kind) - s->name = str2id(pool, join(&pd, pd.kind, ":", sp[0]), 1); + s->name = str2id(pool, join(&pd.common, pd.kind, ":", sp[0]), 1); else s->name = str2id(pool, sp[0], 1); - s->evr = makeevr(pool, join(&pd, sp[1], "-", sp[2])); + s->evr = makeevr(pool, join(&pd.common, sp[1], "-", sp[2])); s->arch = str2id(pool, sp[3], 1); s->vendor = vendor; continue; @@ -609,10 +542,10 @@ } s = 0; if (pd.kind) - name = str2id(pool, join(&pd, pd.kind, ":", sp[0]), 0); + name = str2id(pool, join(&pd.common, pd.kind, ":", sp[0]), 0); else name = str2id(pool, sp[0], 0); - evr = makeevr(pool, join(&pd, sp[1], "-", sp[2])); + evr = makeevr(pool, join(&pd.common, sp[1], "-", sp[2])); arch = str2id(pool, sp[3], 0); /* If we found neither the name nor the arch at all in this repo there's no chance of finding the exact solvable either. */ @@ -648,43 +581,43 @@ switch (tag) { case CTAG('=', 'P', 'r', 'v'): - s->provides = adddep(pool, &pd, s->provides, line, 0, pd.kind); + s->provides = adddep(pool, &pd.common, s->provides, line, 0, pd.kind); continue; case CTAG('=', 'R', 'e', 'q'): - s->requires = adddep(pool, &pd, s->requires, line, -SOLVABLE_PREREQMARKER, pd.kind); + s->requires = adddep(pool, &pd.common, s->requires, line, -SOLVABLE_PREREQMARKER, pd.kind); continue; case CTAG('=', 'P', 'r', 'q'): if (pd.kind) - s->requires = adddep(pool, &pd, s->requires, line, 0, 0); + s->requires = adddep(pool, &pd.common, s->requires, line, 0, 0); else - s->requires = adddep(pool, &pd, s->requires, line, SOLVABLE_PREREQMARKER, 0); + s->requires = adddep(pool, &pd.common, s->requires, line, SOLVABLE_PREREQMARKER, 0); continue; case CTAG('=', 'O', 'b', 's'): - s->obsoletes = adddep(pool, &pd, s->obsoletes, line, 0, pd.kind); + s->obsoletes = adddep(pool, &pd.common, s->obsoletes, line, 0, pd.kind); continue; case CTAG('=', 'C', 'o', 'n'): - s->conflicts = adddep(pool, &pd, s->conflicts, line, 0, pd.kind); + s->conflicts = adddep(pool, &pd.common, s->conflicts, line, 0, pd.kind); continue; case CTAG('=', 'R', 'e', 'c'): - s->recommends = adddep(pool, &pd, s->recommends, line, 0, pd.kind); + s->recommends = adddep(pool, &pd.common, s->recommends, line, 0, pd.kind); continue; case CTAG('=', 'S', 'u', 'p'): - s->supplements = adddep(pool, &pd, s->supplements, line, 0, pd.kind); + s->supplements = adddep(pool, &pd.common, s->supplements, line, 0, pd.kind); continue; case CTAG('=', 'E', 'n', 'h'): - s->enhances = adddep(pool, &pd, s->enhances, line, 0, pd.kind); + s->enhances = adddep(pool, &pd.common, s->enhances, line, 0, pd.kind); continue; case CTAG('=', 'S', 'u', 'g'): - s->suggests = adddep(pool, &pd, s->suggests, line, 0, pd.kind); + s->suggests = adddep(pool, &pd.common, s->suggests, line, 0, pd.kind); continue; case CTAG('=', 'F', 'r', 'e'): - s->freshens = adddep(pool, &pd, s->freshens, line, 0, pd.kind); + s->freshens = adddep(pool, &pd.common, s->freshens, line, 0, pd.kind); continue; case CTAG('=', 'P', 'r', 'c'): - s->recommends = adddep(pool, &pd, s->recommends, line, 0, 0); + s->recommends = adddep(pool, &pd.common, s->recommends, line, 0, 0); continue; case CTAG('=', 'P', 's', 'g'): - s->suggests = adddep(pool, &pd, s->suggests, line, 0, 0); + s->suggests = adddep(pool, &pd.common, s->suggests, line, 0, 0); continue; } if (!with_attr) @@ -845,7 +778,7 @@ } Id name = str2id(pool, sp[0], 1); - Id evr = makeevr(pool, join(&pd, sp[1], "-", sp[2])); + Id evr = makeevr(pool, join(&pd.common, sp[1], "-", sp[2])); Id arch = str2id(pool, sp[3], 1); unsigned n, nn; Solvable *found = 0; @@ -873,7 +806,7 @@ if (data) repodata_internalize(data); - if (pd.tmp) - free(pd.tmp); + if (pd.common.tmp) + free(pd.common.tmp); free(line); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0