Package: svn-buildpackage
Version: 0.6.23
Severity: normal
Tags: patch
Hello,
I was using svn-do and got this output:
$ svn-do
I: Exporting source tree via svn-buildpackage...
E: Resolve them manually before continuing
E: Export failed, check your svn-buildpackage configuration
The problem here is that svn-buildpackage sends some usefull information
about the problem but that information was eaten by svn-do.
The hidden output of "svn-buildpackage --svn-dont-clean --svn-export" was:
$ svn-buildpackage --svn-dont-clean --svn-export
buildArea: /home/rousseau/Sources/Debian/SVN/plucker/build-area
origDir: /home/rousseau/Sources/Debian/SVN/tarballs
tagsDir: /home/rousseau/Sources/Debian/SVN/plucker/tags
tagsUrl: file:///home/SVN/plucker/trunk/plucker/tags
trunkDir: /home/rousseau/Sources/Debian/SVN/plucker/trunk
trunkUrl: file:///home/SVN/plucker/trunk/plucker/trunk/trunk
Complete layout information:
buildArea=/home/rousseau/Sources/Debian/SVN/plucker/build-area
origDir=/home/rousseau/Sources/Debian/SVN/tarballs
tagsDir=/home/rousseau/Sources/Debian/SVN/plucker/tags
tagsUrl=file:///home/SVN/plucker/trunk/plucker/tags
trunkDir=/home/rousseau/Sources/Debian/SVN/plucker/trunk
trunkUrl=file:///home/SVN/plucker/trunk/plucker/trunk/trunk
E: Found unresolved issues:
? debian/.changelog.swp
E: Resolve them manually before continuing
I propose to patch svn-do to display the output of svn-buildpackage in
case of error.
The idea is to use a temporary file to log the output and display it if
needed.
--- svn-do 2007-11-12 20:42:13.000000000 +0100
+++ svn-do2 2008-06-18 13:14:53.000000000 +0200
@@ -53,12 +53,19 @@
fi
echo "I: Exporting source tree via svn-buildpackage..." >&2
-tree=$(LC_ALL=C svn-buildpackage --svn-dont-clean --svn-export | sed -n
's/.*exported to \(.*\)/\1/p')
+log=$(mktemp)
+set +e
+LC_ALL=C svn-buildpackage --svn-dont-clean --svn-export &> "$log"
+set -e
+tree=$(LC_ALL=C cat "$log" | sed -n 's/.*exported to \(.*\)/\1/p')
if [ -z "$tree" ]; then
+ cat "$log"
+ rm "$log"
echo "E: Export failed, check your svn-buildpackage configuration"
exit 1
fi
+rm "$log"
# uncomment this if you want to purge the exported tree on completion
# (successful or not)
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.25-trunk-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages svn-buildpackage depends on:
ii devscripts 2.10.29 scripts to make the life of a Debi
ii file 4.24-2 Determines file type using "magic"
ii libsvn-perl 1.4.6dfsg1-4 Perl bindings for Subversion
ii liburi-perl 1.35.dfsg.1-1 Manipulates and accesses URI strin
ii perl 5.10.0-10 Larry Wall's Practical Extraction
ii subversion 1.4.6dfsg1-4 Advanced version control system
ii unp 1.0.15 unpack (almost) everything with on
ii wget 1.11.3-1 retrieves files from the web
svn-buildpackage recommends no packages.
-- no debconf information
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
