Package: svn-buildpackage
Version: 0.6.16
Severity: normal
File: /usr/bin/svn-inject
Tags: patch
Hi,
the initial checkout (default mode: 1 - trunk only) does not work:
there is an attempt to copy the not existant directory $tempdir/trunk to
the checkout destination. This happened while importing a native package
(only .dsc + .tar.gz).
The attached patch changes this to a regular checkout (no more copying).
Andreas
-- System Information:
Debian Release: 4.0
APT prefers testing
APT policy: (500, 'testing'), (500, 'stable'), (300, 'unstable'), (30,
'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-4-k7
Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Versions of packages svn-buildpackage depends on:
ii devscripts 2.9.27 Scripts to make the life of a Debi
ii file 4.19-1 Determines file type using "magic"
ii libsvn-perl 1.4.2dfsg1-2 Perl bindings for Subversion
ii perl 5.8.8-7 Larry Wall's Practical Extraction
ii subversion 1.4.2dfsg1-2 Advanced version control system
ii wget 1.10.2-2 retrieves files from the web
svn-buildpackage recommends no packages.
-- no debconf information
--- /usr/bin/svn-inject 2006-12-26 16:09:37.000000000 +0100
+++ /home/andreas/bin/svn-inject 2007-02-20 02:18:40.000000000 +0100
@@ -333,10 +333,10 @@
print "Storing copy of your repository tree in $basedir/$package.\n";
withecho "svn", "checkout", "$opt_svnurl/$package", "$basedir/$package",
$opt_svnquiet;
}
- elsif ($opt_checkout==1) {
+ elsif ($opt_checkout==1 && $opt_layout==1) {
$trunkdir = "$basedir/$package";
- print "Storing trunk copy in $basedir/$package.\n";
- withecho("cp", "-a", "$tempdir/trunk", $trunkdir);
+ print "Storing copy of your repository trunk in $basedir/$package.\n";
+ withecho "svn", "checkout", "$opt_svnurl/$package/trunk",
"$basedir/$package", $opt_svnquiet;
}
}
