December 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11923 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes
by mlandres＠svn.opensuse.org 10 Dec '08

10 Dec '08

Author: mlandres Date: Wed Dec 10 16:10:51 2008 New Revision: 11923 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11923&view=rev Log: changes 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=11923&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Wed Dec 10 16:10:51 2008 @@ -63,6 +63,6 @@ SET(LIBZYPP_MINOR "24") SET(LIBZYPP_PATCH "7") # -# LAST RELEASED: 5.24.6 (23) +# LAST RELEASED: 5.24.7 (23) # (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 Wed Dec 10 16:10:51 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Dec 10 16:09:08 CET 2008 - ma(a)suse.de + +- Remove obsolete zypp.conf::productsdir and deprecate + ZConfig::productsPath(). +- Monitor /etc/products.d to determine if @system.solv needs to be + rebuilt. (bnc #457933) +- revision 11923 +- version 5.24.7 (23) + +------------------------------------------------------------------- Mon Dec 8 15:31:18 CET 2008 - ma(a)suse.de - Execute patch scripts chroot to the installed system. (bnc #456795) -- 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] r11922 - in /trunk/libzypp/zypp: RepoStatus.cc RepoStatus.h target/TargetImpl.cc
by mlandres＠svn.opensuse.org 10 Dec '08

10 Dec '08

Author: mlandres Date: Wed Dec 10 16:08:47 2008 New Revision: 11922 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11922&view=rev Log: Monitor /etc/products.d to determine if @system.solv needs to be rebuilt. (bnc #457933) Modified: trunk/libzypp/zypp/RepoStatus.cc trunk/libzypp/zypp/RepoStatus.h trunk/libzypp/zypp/target/TargetImpl.cc Modified: trunk/libzypp/zypp/RepoStatus.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoStatus.cc?rev=1… ============================================================================== --- trunk/libzypp/zypp/RepoStatus.cc (original) +++ trunk/libzypp/zypp/RepoStatus.cc Wed Dec 10 16:08:47 2008 @@ -72,6 +72,20 @@ : _pimpl( new Impl() ) {} + RepoStatus::RepoStatus( const Pathname &path ) + : _pimpl( new Impl() ) + { + PathInfo info(path); + if ( info.isExist() ) + { + _pimpl->timestamp = Date(info.mtime()); + if ( info.isFile() ) + _pimpl->checksum = filesystem::sha1sum(path); + else // non files + _pimpl->checksum = str::numstring(info.mtime()); + } + } + /////////////////////////////////////////////////////////////////// // // METHOD NAME : RepoStatus::~RepoStatus @@ -107,17 +121,6 @@ file.close(); } - RepoStatus::RepoStatus( const Pathname &path ) - : _pimpl( new Impl() ) - { - PathInfo info(path); - if ( info.isExist() ) - { - _pimpl->checksum = filesystem::sha1sum(path); - _pimpl->timestamp = Date(info.mtime()); - } - } - bool RepoStatus::empty() const { return _pimpl->checksum.empty(); Modified: trunk/libzypp/zypp/RepoStatus.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoStatus.h?rev=11… ============================================================================== --- trunk/libzypp/zypp/RepoStatus.h (original) +++ trunk/libzypp/zypp/RepoStatus.h Wed Dec 10 16:08:47 2008 @@ -105,6 +105,14 @@ * * \note construct from a non existing * file will result in an empty status + * + * \note construct from a directory, the + * directories mtime will be also used as + * checksum. + * + * \todo Add recursive option for dirs so we finaly get + * the same as \ref parser::plaindir::dirStatus and can + * unify both. */ RepoStatus( const Pathname &file ); 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 Wed Dec 10 16:08:47 2008 @@ -455,7 +455,9 @@ bool build_rpm_solv = true; // lets see if the rpm solv cache exists - RepoStatus rpmstatus(_root + "/var/lib/rpm/Name"); + RepoStatus rpmstatus( RepoStatus( _root/"/var/lib/rpm/Name" ) + && (_root/"/etc/products.d") ); + bool solvexisted = PathInfo(rpmsolv).isExist(); if ( solvexisted ) { -- 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] r11921 - in /trunk/libzypp: zypp.conf zypp/ZConfig.cc zypp/ZConfig.h
by mlandres＠svn.opensuse.org 10 Dec '08

10 Dec '08

Author: mlandres Date: Wed Dec 10 16:08:27 2008 New Revision: 11921 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11921&view=rev Log: Remove obsolete zypp.conf::productsdir and deprecate ZConfig::productsPath() Modified: trunk/libzypp/zypp.conf trunk/libzypp/zypp/ZConfig.cc trunk/libzypp/zypp/ZConfig.h Modified: trunk/libzypp/zypp.conf URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp.conf?rev=11921&r1=1… ============================================================================== --- trunk/libzypp/zypp.conf (original) +++ trunk/libzypp/zypp.conf Wed Dec 10 16:08:27 2008 @@ -167,18 +167,6 @@ ## -## Path where additional product information, .prod files are kept -## -## Valid values: A directory -## Default value: {configdir}/products.d -## -## Changing this is not recommended, as the directory might -## be populated by packages dropping files to /etc/zypp/products.d. -## -# productsdir = /etc/zypp/products.d - - -## ## Whether required packages are installed ONLY ## So recommended packages, language packages and packages which depend ## on hardware (modalias) will not be regarded. Modified: trunk/libzypp/zypp/ZConfig.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.cc?rev=1192… ============================================================================== --- trunk/libzypp/zypp/ZConfig.cc (original) +++ trunk/libzypp/zypp/ZConfig.cc Wed Dec 10 16:08:27 2008 @@ -246,6 +246,7 @@ } else if ( entry == "productsdir" ) { + WAR << "Deprecated entry 'productsdir=': This locations is no longer used or supported." << endl; cfg_products_path = Pathname(value); } else if ( entry == "solver.onlyRequires" ) Modified: trunk/libzypp/zypp/ZConfig.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.h?rev=11921… ============================================================================== --- trunk/libzypp/zypp/ZConfig.h (original) +++ trunk/libzypp/zypp/ZConfig.h Wed Dec 10 16:08:27 2008 @@ -173,8 +173,9 @@ /** * Directory for additional product information (configPath()/products.d) * \ingroup g_ZC_CONFIGFILES + * \deprecated This locations is no longer used or supported. */ - Pathname productsPath() const; + Pathname productsPath() const ZYPP_DEPRECATED; /** * Solver regards required packages,patterns,... only -- 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] r11920 - /trunk/libzypp/devel/devel.ma/NewPool.cc
by mlandres＠svn.opensuse.org 10 Dec '08

10 Dec '08

Author: mlandres Date: Wed Dec 10 16:00:54 2008 New Revision: 11920 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11920&view=rev Log: backup Modified: trunk/libzypp/devel/devel.ma/NewPool.cc Modified: trunk/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.c… ============================================================================== --- trunk/libzypp/devel/devel.ma/NewPool.cc (original) +++ trunk/libzypp/devel/devel.ma/NewPool.cc Wed Dec 10 16:00:54 2008 @@ -453,13 +453,14 @@ getZYpp()->initializeTarget( sysRoot ); } getZYpp()->target()->load(); + USR << "baseproduct: " << getZYpp()->target()->baseProduct() << endl; USR << "targetDistribution: " << getZYpp()->target()->targetDistribution() << endl; USR << "targetDistributionRelease: " << getZYpp()->target()->targetDistributionRelease() << endl; dumpRange( USR << "Product ", pool.byKindBegin<Product>(), pool.byKindEnd<Product>() ) << endl; } } - if ( 1 ) + if ( 0 ) { RepoManager repoManager( makeRepoManager( sysRoot ) ); ServiceInfoList services = repoManager.knownServices(); @@ -560,9 +561,7 @@ } } - - MIL << Arch_ppc.compatibleWith( Arch_x86_64 ) << endl; - MIL << Arch_i586.compatibleWith( Arch_x86_64 ) << endl; + SEC << "baseproduct: " << getZYpp()->target()->baseProduct() << endl; #if 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] r11919 - /trunk/sat-solver/bindings/pool.i
by mlschroe＠svn.opensuse.org 10 Dec '08

10 Dec '08

Author: mlschroe Date: Wed Dec 10 14:11:50 2008 New Revision: 11919 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11919&view=rev Log: - delete pool_createwhatprovides() call, makes no sense here Modified: trunk/sat-solver/bindings/pool.i Modified: trunk/sat-solver/bindings/pool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/pool.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/pool.i (original) +++ trunk/sat-solver/bindings/pool.i Wed Dec 10 14:11:50 2008 @@ -237,9 +237,6 @@ void each_provider( int id ) { if (id > 0 && id < $self->whatprovidesdataoff) { - if (!$self->whatprovides) - pool_createwhatprovides($self); - while ($self->whatprovidesdata[id]) { generic_xsolvables_iterate_callback( xsolvable_new( $self, $self->whatprovidesdata[id++] ), NULL ); } -- 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] r11918 - /trunk/sat-solver/bindings/pool.i
by kkaempf＠svn.opensuse.org 10 Dec '08

10 Dec '08

Author: kkaempf Date: Wed Dec 10 12:37:18 2008 New Revision: 11918 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11918&view=rev Log: provide access to whatprovidesdata via Pool.each_provider(int) Modified: trunk/sat-solver/bindings/pool.i Modified: trunk/sat-solver/bindings/pool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/pool.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/pool.i (original) +++ trunk/sat-solver/bindings/pool.i Wed Dec 10 12:37:18 2008 @@ -61,6 +61,8 @@ { return xsolvable_new( $self, (Id)id); } + Relation *relation( int rel ) + { return relation_new( $self, (Id)rel ); } #if defined(SWIGRUBY) %{ @@ -232,6 +234,18 @@ } } + void each_provider( int id ) + { + if (id > 0 && id < $self->whatprovidesdataoff) { + if (!$self->whatprovides) + pool_createwhatprovides($self); + + while ($self->whatprovidesdata[id]) { + generic_xsolvables_iterate_callback( xsolvable_new( $self, $self->whatprovidesdata[id++] ), NULL ); + } + } + } + #endif #if defined(SWIGPERL) -- 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] r11917 - in /branches/SuSE-Linux-11_0-Branch/libzypp: VERSION.cmake package/libzypp.changes
by dmacvicar＠svn.opensuse.org 10 Dec '08

10 Dec '08

Author: dmacvicar Date: Wed Dec 10 10:46:31 2008 New Revision: 11917 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11917&view=rev Log: bump Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake Wed Dec 10 10:46:31 2008 @@ -45,6 +45,6 @@ # SET(LIBZYPP_MAJOR "4") -SET(LIBZYPP_MINOR "27") +SET(LIBZYPP_MINOR "28") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "5") +SET(LIBZYPP_PATCH "0") Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Wed Dec 10 10:46:31 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 10 10:43:29 CET 2008 - dmacvicar(a)suse.de + +- bump version due to new public method +- 4.28.0 + +------------------------------------------------------------------- Mon Dec 8 10:47:33 CET 2008 - schubi(a)suse.de - Make the solver reset function public (bnc #439373) -- 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] r11916 - /trunk/tools/patch2mail/patch2mail.spec
by cboltz＠svn.opensuse.org 09 Dec '08

09 Dec '08

Author: cboltz Date: Tue Dec 9 23:08:06 2008 New Revision: 11916 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11916&view=rev Log: - changed URL in specfile to point to articles tagged "patch2mail" in my blog (consider this the official patch2mail homepage ;-) Modified: trunk/tools/patch2mail/patch2mail.spec Modified: trunk/tools/patch2mail/patch2mail.spec URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail.spec… ============================================================================== --- trunk/tools/patch2mail/patch2mail.spec (original) +++ trunk/tools/patch2mail/patch2mail.spec Tue Dec 9 23:08:06 2008 @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bash # -URL: http://www.cboltz.de +URL: http://blog.cboltz.de/plugin/tag/patch2mail Source: %{name}-%{version}.tar.bz2 # Summary: Patch notification via mail -- 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] r11915 - in /trunk/tools/patch2mail: patch2mail patch2mail.changes patch2mail.spec patch2mail.xsl patch2mail.xsl_10.3 patch2mail_11.0
by cboltz＠svn.opensuse.org 09 Dec '08

09 Dec '08

Author: cboltz Date: Tue Dec 9 13:35:09 2008 New Revision: 11915 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11915&view=rev Log: - some small output fixes - enforce LANG=C to avoid charset problems in zypper output - version 0.9.4 - added patch2mail_11.0 and patch2mail.xsl_10.3 to SVN (were forgotten on last commit) Added: trunk/tools/patch2mail/patch2mail.xsl_10.3 trunk/tools/patch2mail/patch2mail_11.0 (with props) Modified: trunk/tools/patch2mail/patch2mail trunk/tools/patch2mail/patch2mail.changes trunk/tools/patch2mail/patch2mail.spec trunk/tools/patch2mail/patch2mail.xsl Modified: trunk/tools/patch2mail/patch2mail URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail?rev=… ============================================================================== --- trunk/tools/patch2mail/patch2mail (original) +++ trunk/tools/patch2mail/patch2mail Tue Dec 9 13:35:09 2008 @@ -3,7 +3,7 @@ tmp="$(mktemp /tmp/updates.XXXXXX)" /usr/sbin/zypp-refresh-wrapper >/dev/null -/usr/bin/zypper --xmlout lu -t patch | xsltproc /usr/share/patch2mail/patch2mail.xsl - > "$tmp" +LANG=C /usr/bin/zypper --xmlout lu -t patch | xsltproc /usr/share/patch2mail/patch2mail.xsl - > "$tmp" grep "ERROR\|^===" "$tmp" >/dev/null || { rm -f "$tmp" exit 0 # no updates, no errors Modified: trunk/tools/patch2mail/patch2mail.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail.chan… ============================================================================== --- trunk/tools/patch2mail/patch2mail.changes (original) +++ trunk/tools/patch2mail/patch2mail.changes Tue Dec 9 13:35:09 2008 @@ -1,3 +1,8 @@ +Tue Dec 09 13:24:00 CET 2008 - cboltz +- some small output fixes +- enforce LANG=C to avoid charset problems in zypper output +- version 0.9.4 + Fri Nov 21 20:45:00 CEST 2008 - cboltz - update for openSUSE 11.1 (zypper needs "lu -t patch" now) Modified: trunk/tools/patch2mail/patch2mail.spec URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail.spec… ============================================================================== --- trunk/tools/patch2mail/patch2mail.spec (original) +++ trunk/tools/patch2mail/patch2mail.spec Tue Dec 9 13:35:09 2008 @@ -1,7 +1,7 @@ # norootforbuild # Name: patch2mail -Version: 0.9.3 +Version: 0.9.4 Release: 1 # License: GPL @@ -69,6 +69,14 @@ %doc README %changelog + +* Tue Dec 09 2008 - cboltz +- some small output fixes +- enforce LANG=C to avoid charset problems in zypper output +- version 0.9.4 +* Fri Nov 21 2008 - cboltz +- update for openSUSE 11.1 (zypper needs "lu -t patch" now) +- version 0.9.3 * Sun Jul 20 2008 - cboltz - update for openSUSE 11.0 (scripts for older versions still included) - version 0.9.2 Modified: trunk/tools/patch2mail/patch2mail.xsl URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail.xsl?… ============================================================================== --- trunk/tools/patch2mail/patch2mail.xsl (original) +++ trunk/tools/patch2mail/patch2mail.xsl Tue Dec 9 13:35:09 2008 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-15"?>  -<xsl:stylesheet version="1.1" +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - - +<xsl:output method="text"/> <xsl:strip-space elements="*"/> @@ -30,9 +29,8 @@ <xsl:template match="/"><xsl:apply-templates /></xsl:template> <xsl:template match="update-status"> -<xsl:document href="-" method="text" ><xsl:apply-templates /> -</xsl:document></xsl:template> - +<xsl:apply-templates /> +</xsl:template>  @@ -93,8 +91,16 @@ <xsl:template match="update-list/update/source">Update source: <xsl:value-of select="@alias" /> (<xsl:value-of select="@url" />)</xsl:template> --> + +<xsl:template match="message"> + <xsl:if test="@type != 'info'"> + <xsl:text>
ERROR: </xsl:text> + <xsl:apply-templates /> + <xsl:text>
</xsl:text> + </xsl:if> +</xsl:template> - + <xsl:template match="update-summary"> <xsl:text>--------------------------------------------------------

</xsl:text> Added: trunk/tools/patch2mail/patch2mail.xsl_10.3 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail.xsl_… ============================================================================== --- trunk/tools/patch2mail/patch2mail.xsl_10.3 (added) +++ trunk/tools/patch2mail/patch2mail.xsl_10.3 Tue Dec 9 13:35:09 2008 @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="ISO-8859-15"?> + + +<xsl:stylesheet version="1.1" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + + + +<xsl:strip-space elements="*"/> + + +<xsl:template match="/"><xsl:apply-templates /></xsl:template> + +<xsl:template match="update-status"> +<xsl:document href="-" method="text" ><xsl:apply-templates /> +</xsl:document></xsl:template> + + + + +<xsl:template match="errors"><xsl:apply-templates /></xsl:template> + +<xsl:template match="errors/error"> + <xsl:text>*** ERROR ***
</xsl:text> + <xsl:apply-templates /> + <xsl:text>

</xsl:text> +</xsl:template> + + + + +<xsl:template match="update-sources"> + <xsl:text>Update sources:
</xsl:text> + <xsl:apply-templates /> + <xsl:text>
</xsl:text> +</xsl:template> + +<xsl:template match="update-sources/source"> + <xsl:text>- </xsl:text> + <xsl:value-of select="@alias" /> (<xsl:value-of select="@url" />) +</xsl:template> + + + + +<xsl:template match="update-list"> + <xsl:apply-templates /> +</xsl:template> + +<xsl:template match="update-list/update"> +<xsl:if test="@kind = 'patch'"> + <xsl:text>
=== </xsl:text> + <xsl:value-of select="@name" /> + <xsl:text> - Patch </xsl:text> + <xsl:value-of select="@edition" /> + <xsl:text> (</xsl:text> + <xsl:value-of select="@category" /> + <xsl:text>) ===

</xsl:text> + <xsl:apply-templates /> + <xsl:text>
</xsl:text> +</xsl:if> +</xsl:template> + +<xsl:template match="update-list/update/summary"> + <xsl:apply-templates /> +</xsl:template> + +<xsl:template match="update-list/update/description"> + <xsl:text>

</xsl:text> + <xsl:apply-templates /> +</xsl:template> + + + + + + + +<xsl:template match="update-summary"> + <xsl:text>--------------------------------------------------------

</xsl:text> + <xsl:text> Total: </xsl:text> + <xsl:value-of select="@total" /> + <xsl:text> updates (</xsl:text> + <xsl:value-of select="@security" /> + <xsl:text> security)
__TOTAL__</xsl:text> + <xsl:value-of select="@total" /><xsl:value-of select="@security" /> + <xsl:text>__
</xsl:text> +</xsl:template> + + + + +</xsl:stylesheet> Added: trunk/tools/patch2mail/patch2mail_11.0 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail_11.0… ============================================================================== --- trunk/tools/patch2mail/patch2mail_11.0 (added) +++ trunk/tools/patch2mail/patch2mail_11.0 Tue Dec 9 13:35:09 2008 @@ -0,0 +1,14 @@ +#!/bin/bash + +tmp="$(mktemp /tmp/updates.XXXXXX)" + +/usr/sbin/zypp-refresh-wrapper >/dev/null +/usr/bin/zypper --xmlout lu | xsltproc /usr/share/patch2mail/patch2mail.xsl - > "$tmp" +grep "ERROR\|^===" "$tmp" >/dev/null || { + rm -f "$tmp" + exit 0 # no updates, no errors +} + +grep -v "^__TOTAL__" "$tmp" | mail -s "$(hostname) updates" root +# echo "*** $(hostname) updates ***"; grep -v "^__TOTAL__" "$tmp" +rm -f "$tmp" -- 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] r11914 - in /trunk/sat-solver: applayer/decision.c applayer/decision.h bindings/decision.i bindings/ruby/tests/reasons.rb
by kkaempf＠svn.opensuse.org 09 Dec '08

09 Dec '08

Author: kkaempf Date: Tue Dec 9 12:49:09 2008 New Revision: 11914 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11914&view=rev Log: fix 'rule' pointer in decisions to detect '0'-rule correctly Modified: trunk/sat-solver/applayer/decision.c trunk/sat-solver/applayer/decision.h trunk/sat-solver/bindings/decision.i trunk/sat-solver/bindings/ruby/tests/reasons.rb Modified: trunk/sat-solver/applayer/decision.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/decision.c?r… ============================================================================== --- trunk/sat-solver/applayer/decision.c (original) +++ trunk/sat-solver/applayer/decision.c Tue Dec 9 12:49:09 2008 @@ -20,10 +20,10 @@ #include "solverdebug.h" Decision * -decision_new( Pool *pool, int op, Id solvable, Rule *rule ) +decision_new( Solver *solver, int op, Id solvable, Rule *rule ) { Decision *d = (Decision *)malloc( sizeof( Decision )); - d->pool = pool; + d->solver = solver; d->op = op; d->solvable = solvable; d->rule = rule; @@ -39,7 +39,6 @@ void solver_decisions_iterate( Solver *solver, int (*callback)( const Decision *d, void *user_data ), void *user_data ) { - Pool *pool = solver->pool; Repo *installed = solver->installed; Id p, *obsoletesmap = solver_create_decisions_obsoletesmap( solver ); Id s; @@ -78,7 +77,7 @@ s = p; if (installed) { - Solvable *solv = pool_id2solvable( pool, p ); + Solvable *solv = pool_id2solvable( solver->pool, p ); if (solv->repo == installed) continue; /* don't report 'keep installed' decision */ } @@ -91,7 +90,7 @@ op = DECISION_INSTALL; } } - d = decision_new( pool, op, s, why ? solver->rules + why : NULL ); + d = decision_new( solver, op, s, solver->rules + why ); if (callback( d, user_data )) break; } Modified: trunk/sat-solver/applayer/decision.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/decision.h?r… ============================================================================== --- trunk/sat-solver/applayer/decision.h (original) +++ trunk/sat-solver/applayer/decision.h Tue Dec 9 12:49:09 2008 @@ -17,7 +17,6 @@ * */ -#include "pool.h" #include "solver.h" enum decisions { @@ -29,12 +28,12 @@ typedef struct _Decision { enum decisions op; - Pool *pool; + Solver *solver; Id solvable; Rule *rule; } Decision; -Decision *decision_new( Pool *pool, int op, Id solvable, Rule *rule ); +Decision *decision_new( Solver *solver, int op, Id solvable, Rule *rule ); void decision_free( Decision *d ); void solver_decisions_iterate( Solver *solver, int (*callback)( const Decision *d, void *user_data ), void *user_data); Modified: trunk/sat-solver/bindings/decision.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/decision.i?r… ============================================================================== --- trunk/sat-solver/bindings/decision.i (original) +++ trunk/sat-solver/bindings/decision.i Tue Dec 9 12:49:09 2008 @@ -18,8 +18,8 @@ ~Decision() { decision_free( $self ); } - Pool *pool() - { return $self->pool; } + Solver *solver() + { return $self->solver; } int op() { return $self->op; } const char *op_s() @@ -33,8 +33,11 @@ return "unknown"; } XSolvable *solvable() - { return xsolvable_new( $self->pool, $self->solvable ); } + { return xsolvable_new( $self->solver->pool, $self->solvable ); } Rule *rule() - { return $self->rule; } + { if ($self->rule > $self->solver->rules) + return $self->rule; + return NULL; + } } Modified: trunk/sat-solver/bindings/ruby/tests/reasons.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/reasons.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/reasons.rb Tue Dec 9 12:49:09 2008 @@ -74,6 +74,36 @@ end # class Rule end +def explain solver, transaction + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + solver.each_decision do |d| + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule})" + e = solver.explain( transaction, d) + if e.nil? + puts "\t unexplainable" + else + pis = pi_s e.shift + rel = e.shift + src = e.shift + if src.nil? + puts "\t #{pis}" + else + tgt = e.shift + if tgt + puts "\t [#{src}: #{pis} #{rel} provided by #{tgt}]" + else + puts "\t [#{src}: #{pis} #{rel}]" + end + end + end + end +end + # SolverProbleminfo to string def pi_s pi case pi @@ -118,23 +148,10 @@ @pool.prepare solver = @pool.create_solver( ) solver.solve( transaction ) - solver.each_to_install { |s| - puts "Install #{s}" - } - solver.each_to_remove { |s| - puts "Remove #{s}" - } - solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)})" - e = solver.explain( transaction, d) - pis = pi_s e.shift - rel = e.shift - src = e.shift - tgt = e.shift - puts "\t [#{src} #{pis} #{rel}: #{tgt}]" - end + explain solver, transaction end + def test_indirect_requires solv1 = @repo.create_solvable( 'A', '1.0-0' ) assert solv1 @@ -155,23 +172,10 @@ @pool.prepare solver = @pool.create_solver( ) solver.solve( transaction ) - solver.each_to_install { |s| - puts "Install #{s}" - } - solver.each_to_remove { |s| - puts "Remove #{s}" - } - - solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)})" - e = solver.explain( transaction, d) - pis = pi_s e.shift - rel = e.shift - src = e.shift - tgt = e.shift - puts "\t [#{src} #{pis} #{rel}: #{tgt}]" - end + explain solver, transaction end + + def test_indirect_requires_choose solv1 = @repo.create_solvable( 'A', '1.0-0' ) assert solv1 @@ -195,23 +199,10 @@ @pool.prepare solver = @pool.create_solver( ) solver.solve( transaction ) - solver.each_to_install { |s| - puts "Install #{s}" - } - solver.each_to_remove { |s| - puts "Remove #{s}" - } - - solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule})" - e = solver.explain( transaction, d) - pis = pi_s e.shift - rel = e.shift - src = e.shift - tgt = e.shift - puts "\t [#{src} #{pis} #{rel}: #{tgt}]" - end + explain solver, transaction end + + def test_install_bash solvpath = Pathname( File.dirname( __FILE__ ) ) + Pathname( "../../testdata" ) + "os11-beta5-i386.solv" repo = @pool.add_solv( solvpath ) @@ -225,29 +216,10 @@ solver = @pool.create_solver( ) # solver.dont_install_recommended = true solver.solve( transaction ) - solver.each_to_install { |s| - puts "Install #{s}" - } - solver.each_to_remove { |s| - puts "Remove #{s}" - } - - puts "#{solver.rule_count} rules" - puts "rpm(#{solver.rpmrules_start}..#{solver.rpmrules_end})" - puts "feature(#{solver.featurerules_start}..#{solver.featurerules_end})" - puts "update(#{solver.updaterules_start}..#{solver.updaterules_end})" - puts "job(#{solver.jobrules_start}..#{solver.jobrules_end})" - puts "learnt(#{solver.learntrules_start}..#{solver.learntrules_end})" - solver.each_decision do |d| - puts " #{d.solvable}\n\t#{d.op_s} (#{d.rule}:#{d.rule.to_dep(@pool) if d.rule})" - e = solver.explain( transaction, d) - pis = pi_s e.shift - rel = e.shift - src = e.shift - tgt = e.shift - puts "\t [#{src} #{pis} #{rel}: #{tgt}]" - end + explain solver, transaction end + + def test_conflicts installed = @pool.create_repo( 'installed' ) solv1 = installed.create_solvable( 'A', '1.0-0' ) @@ -270,23 +242,10 @@ @pool.prepare solver = @pool.create_solver( ) solver.solve( transaction ) - solver.each_to_install { |s| - puts "Install #{s}" - } - solver.each_to_remove { |s| - puts "Remove #{s}" - } - - solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule})" - e = solver.explain( transaction, d) - pis = pi_s e.shift - rel = e.shift - src = e.shift - tgt = e.shift - puts "\t [#{src} #{pis} #{rel}: #{tgt}]" - end + explain solver, transaction end + + def test_obsoletes installed = @pool.create_repo( 'installed' ) solv1 = installed.create_solvable( 'A', '1.0-0' ) @@ -308,23 +267,10 @@ @pool.prepare solver = @pool.create_solver( ) solver.solve( transaction ) - solver.each_to_install { |s| - puts "Install #{s}" - } - solver.each_to_remove { |s| - puts "Remove #{s}" - } - - solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule})" - e = solver.explain( transaction, d) - pis = pi_s e.shift - rel = e.shift - src = e.shift - tgt = e.shift - puts "\t [#{src} #{pis} #{rel}: #{tgt}]" - end + explain solver, transaction end + + def test_indirect_removal solv1 = @repo.create_solvable( 'A', '1.0-0' ) assert solv1 @@ -348,21 +294,7 @@ solver = @pool.create_solver( ) solver.allow_uninstall = true solver.solve( transaction ) - solver.each_to_install { |s| - puts "Install #{s}" - } - solver.each_to_remove { |s| - puts "Remove #{s}" - } - solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)})" - e = solver.explain( transaction, d) - pis = pi_s e.shift - rel = e.shift - src = e.shift - tgt = e.shift - puts "\t [#{src} #{pis} #{rel}: #{tgt}]" - end + explain solver, transaction end end -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0