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=11915&r1=11914&r2=11915&view=diff ============================================================================== --- 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.changes?rev=11915&r1=11914&r2=11915&view=diff ============================================================================== --- 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?rev=11915&r1=11914&r2=11915&view=diff ============================================================================== --- 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?rev=11915&r1=11914&r2=11915&view=diff ============================================================================== --- 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"?> <!-- -Copyright (c) 2007 Christian Boltz - www.cboltz.de +Copyright (c) 2007-2008 Christian Boltz - www.cboltz.de Thanks to Thomas Schraitle for helping with some xslt details. @@ -19,10 +19,9 @@ --> -http://www.w3.org/1999/XSL/Transform"> - -<!-- <xsl:output method="text" encoding="ISO-8859-15" media-type="text/plain" /> --> + @@ -30,9 +29,8 @@ - - - + + <!-- errors --> @@ -93,8 +91,16 @@ Update source: () --> +<!-- messages, unless type="info" --> + + + xsl:text ERROR: + + xsl:text + + -<!-- summary --> +<!-- summary (only available in openSUSE <= 10.2) --> xsl:text-------------------------------------------------------- Added: trunk/tools/patch2mail/patch2mail.xsl_10.3 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail.xsl_10.3?rev=11915&view=auto ============================================================================== --- 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"?> +<!-- + +Copyright (c) 2007 Christian Boltz - www.cboltz.de + +Thanks to Thomas Schraitle for helping with some xslt details. + + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License (http://www.gnu.org/copyleft/gpl.html) +for more details. + +--> + +http://www.w3.org/1999/XSL/Transform"> + +<!-- <xsl:output method="text" encoding="ISO-8859-15" media-type="text/plain" /> --> + + + + + + + + + + + +<!-- errors --> + + + + + xsl:text*** ERROR *** + + xsl:text + + + +<!-- update sources --> + + + xsl:textUpdate sources: + + xsl:text + + + + xsl:text- + () + + + +<!-- updates --> + + + + + + + + xsl:text === + + xsl:text - Patch + + xsl:text ( + + xsl:text) === + + xsl:text + + + + + + + + + xsl:text + + + +<!-- update source of this specific update isn't that interesting ;-) --> +<!-- +<xsl:template match="update-list/update/source">Update source: <xsl:value-of select="@alias" /> (<xsl:value-of select="@url" />)</xsl:template> +--> + + +<!-- summary --> + + + xsl:text-------------------------------------------------------- + xsl:text Total: + + xsl:text updates ( + + xsl:text security) __TOTAL__ + + xsl:text__ + + + +<!-- end --> + + Added: trunk/tools/patch2mail/patch2mail_11.0 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/tools/patch2mail/patch2mail_11.0?rev=11915&view=auto ============================================================================== --- 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@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org