Zypp Commits

Download

zypp-commit@lists.opensuse.org

October 2008

10 participants
342 discussions

[zypp-commit] r11220 - in /trunk: libzypp/zypp/ResObject.cc libzypp/zypp/ResObject.h libzypp/zypp/sat/SolvAttr.cc libzypp/zypp/sat/SolvAttr.h sat-solver/src/knownid.h sat-solver/tools/repo_products.c
by dmacvicar＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: dmacvicar Date: Wed Oct 1 13:21:57 2008 New Revision: 11220 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11220&view=rev Log: cpename -> cpeid Modified: trunk/libzypp/zypp/ResObject.cc trunk/libzypp/zypp/ResObject.h trunk/libzypp/zypp/sat/SolvAttr.cc trunk/libzypp/zypp/sat/SolvAttr.h trunk/sat-solver/src/knownid.h trunk/sat-solver/tools/repo_products.c Modified: trunk/libzypp/zypp/ResObject.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResObject.cc?rev=11… ============================================================================== --- trunk/libzypp/zypp/ResObject.cc (original) +++ trunk/libzypp/zypp/ResObject.cc Wed Oct 1 13:21:57 2008 @@ -73,8 +73,8 @@ std::string ResObject::distribution() const { return lookupStrAttribute( sat::SolvAttr::distribution ); } - std::string ResObject::cpeName() const - { return lookupStrAttribute( sat::SolvAttr::cpename ); } + std::string ResObject::cpeId() const + { return lookupStrAttribute( sat::SolvAttr::cpeid ); } 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=112… ============================================================================== --- trunk/libzypp/zypp/ResObject.h (original) +++ trunk/libzypp/zypp/ResObject.h Wed Oct 1 13:21:57 2008 @@ -149,7 +149,7 @@ * * See http://cpe.mitre.org */ - std::string cpeName() const; + std::string cpeId() const; /** Installed size. */ ByteCount installSize() const; Modified: trunk/libzypp/zypp/sat/SolvAttr.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.cc?rev… ============================================================================== --- trunk/libzypp/zypp/sat/SolvAttr.cc (original) +++ trunk/libzypp/zypp/sat/SolvAttr.cc Wed Oct 1 13:21:57 2008 @@ -42,7 +42,7 @@ const SolvAttr SolvAttr::insnotify ( SOLVABLE_MESSAGEINS ); // translated const SolvAttr SolvAttr::delnotify ( SOLVABLE_MESSAGEDEL ); // translated const SolvAttr SolvAttr::eula ( SOLVABLE_EULA ); // translated - const SolvAttr SolvAttr::cpename ( SOLVABLE_CPE_NAME ); + const SolvAttr SolvAttr::cpeid ( SOLVABLE_CPE_ID ); const SolvAttr SolvAttr::installtime ( SOLVABLE_INSTALLTIME ); const SolvAttr SolvAttr::buildtime ( SOLVABLE_BUILDTIME ); const SolvAttr SolvAttr::installsize ( SOLVABLE_INSTALLSIZE ); Modified: trunk/libzypp/zypp/sat/SolvAttr.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.h?rev=… ============================================================================== --- trunk/libzypp/zypp/sat/SolvAttr.h (original) +++ trunk/libzypp/zypp/sat/SolvAttr.h Wed Oct 1 13:21:57 2008 @@ -64,7 +64,7 @@ static const SolvAttr installsize; static const SolvAttr downloadsize; static const SolvAttr diskusage; - static const SolvAttr cpename; + static const SolvAttr cpeid; //@} /** \name package */ Modified: trunk/sat-solver/src/knownid.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/knownid.h?rev=112… ============================================================================== --- trunk/sat-solver/src/knownid.h (original) +++ trunk/sat-solver/src/knownid.h Wed Oct 1 13:21:57 2008 @@ -95,7 +95,7 @@ KNOWNID(SOLVABLE_BUILDTIME, "solvable:buildtime"), KNOWNID(SOLVABLE_BUILDHOST, "solvable:buildhost"), KNOWNID(SOLVABLE_EULA, "solvable:eula"), -KNOWNID(SOLVABLE_CPE_NAME, "solvable:cpename"), +KNOWNID(SOLVABLE_CPE_ID, "solvable:cpeid"), KNOWNID(SOLVABLE_MESSAGEINS, "solvable:messageins"), KNOWNID(SOLVABLE_MESSAGEDEL, "solvable:messagedel"), KNOWNID(SOLVABLE_INSTALLSIZE, "solvable:installsize"), 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 Wed Oct 1 13:21:57 2008 @@ -46,7 +46,7 @@ STATE_SUMMARY, // 7 STATE_DESCRIPTION, // 8 STATE_UPDATEREPOKEY, // 9 should go away - STATE_CPENAME, // 9 + STATE_CPEID, // 9 STATE_URLS, // 10 STATE_URL, // 11 STATE_RUNTIMECONFIG, // 12 @@ -81,7 +81,7 @@ { STATE_PRODUCT, "runtimeconfig", STATE_RUNTIMECONFIG, 0 }, { STATE_PRODUCT, "linguas", STATE_LINGUAS, 0 }, { STATE_PRODUCT, "updaterepokey", STATE_UPDATEREPOKEY, 1 }, - { STATE_PRODUCT, "cpename", STATE_CPENAME, 1 }, + { STATE_PRODUCT, "cpename", STATE_CPEID, 1 }, { STATE_URLS, "url", STATE_URL, 1 }, { STATE_LINGUAS, "lang", STATE_LANG, 0 }, { STATE_REGISTER, "flavor", STATE_FLAVOR, 1 }, @@ -354,9 +354,9 @@ printf("%s\n", pd->content); } break; - case STATE_CPENAME: + case STATE_CPEID: if (pd->content) - repodata_set_str(pd->data, pd->handle, SOLVABLE_CPE_NAME, pd->content); + repodata_set_str(pd->data, pd->handle, SOLVABLE_CPE_ID, pd->content); default: break; } -- 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] r11219 - /trunk/sat-solver/tools/repo2solv.sh
by mlschroe＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: mlschroe Date: Wed Oct 1 12:11:43 2008 New Revision: 11219 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11219&view=rev Log: - support repomd pattern.xml Modified: trunk/sat-solver/tools/repo2solv.sh Modified: trunk/sat-solver/tools/repo2solv.sh URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo2solv.sh?re… ============================================================================== --- trunk/sat-solver/tools/repo2solv.sh (original) +++ trunk/sat-solver/tools/repo2solv.sh Wed Oct 1 12:11:43 2008 @@ -38,6 +38,7 @@ # like susedata.xml, other.xml, filelists.xml echo '<rpmmd>' for i in primary.xml* susedata.xml*; do + test -s "$i" || continue case $i in *.gz) gzip -dc "$i";; *.bz2) bzip2 -dc "$i";; @@ -49,6 +50,7 @@ break done for i in susedata.xml*; do + test -s "$i" || continue case $i in *.gz) gzip -dc "$i";; *.bz2) bzip2 -dc "$i";; @@ -77,6 +79,23 @@ ) | grep -v '\?xml' | rpmmd2solv $parser_options > $prodfile || exit 4 fi + patternfile="/nonexist" + for i in patterns.xml*; do + test -s "$i" || continue + # got one! + patternfile=`mktemp` || exit 3 + ( + for i in patterns.xml*; do + test -s "$i" || continue + case $i in + *.gz) gzip -dc "$i" ;; + *.bz2) bzip2 -dc "$i" ;; + *) cat "$i" ;; + esac + done + ) | rpmmd2solv $parser_options > $patternfile || exit 4 + break + done # This contains repomd.xml # for now we only read some keys like timestamp @@ -184,6 +203,9 @@ if test -s $primfile; then m_primfile=$primfile fi + if test -s $patternfile; then + m_patternfile=$patternfile + fi if test -s $prodfile; then m_prodfile=$prodfile fi @@ -196,8 +218,8 @@ if test -s $deltainfofile; then m_deltainfofile=$deltainfofile fi - mergesolv $m_repomdfile $m_suseinfofile $m_primfile $m_prodfile $m_patchfile $m_updateinfofile $m_deltainfofile - rm -f $repomdfile $suseinfofile $primfile $prodfile $patchfile $updateinfofile $deltainfofile + mergesolv $m_repomdfile $m_suseinfofile $m_primfile $m_prodfile $m_patternfile $m_patchfile $m_updateinfofile $m_deltainfofile + rm -f $repomdfile $suseinfofile $primfile $patternfile $prodfile $patchfile $updateinfofile $deltainfofile elif test_susetags; then olddir=`pwd` -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

Jump to page: