Package: devscripts
Version: 2.10.70
Severity: wishlist
File: /usr/bin/cowpoke
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
cowpoke keeps re-transmitting the same .orig.tar.gz file. The attached
patch uses rsync instead of scp to avoid that.
It does add another dependency for both sides of the connection, but I
guess if you are root and can install cowbuilder, then you can also
install rsync.
Thanks,
Joachim
- -- Package-specific info:
- --- /etc/devscripts.conf ---
- --- ~/.devscripts ---
DEBCHANGE_RELEASE_HEURISTIC=changelog
DEBRELEASE_UPLOADER=dput
- -- System Information:
Debian Release: 6.0
APT prefers unstable
APT policy: (500, 'unstable'), (101, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.36-trunk-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages devscripts depends on:
ii dpkg-dev 1.15.8.8 Debian package development tools
ii libc6 2.11.2-8 Embedded GNU C Library: Shared lib
ii perl 5.10.1-17 Larry Wall's Practical Extraction
Versions of packages devscripts recommends:
ii at 3.1.12-1 Delayed job execution and batch pr
ii bsd-mailx [mailx] 8.1.2-0.20100314cvs-1 simple mail user agent
ii bzr 2.3.0~beta3-1 easy to use distributed version co
ii curl 7.21.2-4 Get a file from an HTTP, HTTPS or
ii cvs 1:1.12.13-12 Concurrent Versions System
ii darcs 2.4.4-3 a distributed, interactive, smart
ii dctrl-tools 2.14.5 Command-line tools to process Debi
ii debian-keyring [de 2010.12.29 GnuPG keys of Debian Developers
ii dput 0.9.6.1 Debian package upload tool
ii epiphany-browser [ 2.30.6-1 Intuitive GNOME web browser
ii equivs 2.0.8 Circumvent Debian package dependen
ii fakeroot 1.14.5-1 Gives a fake root environment
ii galeon [www-browse 2.0.7-2.1+b1 GNOME web browser for advanced use
ii git [git-core] 1:1.7.2.3-2.2 fast, scalable, distributed revisi
ii git-core 1:1.7.2.3-2.2 fast, scalable, distributed revisi
ii gnupg 1.4.10-4 GNU privacy guard - a free PGP rep
ii iceweasel [www-bro 3.5.16-4 Web browser based on Firefox
ii libauthen-sasl-per 2.1500-1 Authen::SASL - SASL Authentication
ii libcrypt-ssleay-pe 0.57-2 Support for https protocol in LWP
ii libjson-perl 2.27-1 Perl module to parse and convert t
ii libparse-debcontro 2.005-2 Easy OO parsing of Debian control-
ii libsoap-lite-perl 0.712-2 Perl implementation of a SOAP clie
ii libterm-size-perl 0.2-4+b1 Perl extension for retrieving term
ii libtimedate-perl 1.2000-1 collection of modules to manipulat
ii liburi-perl 1.56-1 module to manipulate and access UR
ii libwww-perl 5.837-1 simple and consistent interface to
ii libyaml-syck-perl 1.17-1 Perl module providing a fast, ligh
ii lintian 2.4.3 Debian package checker
ii lsb-release 3.2-26 Linux Standard Base version report
ii lynx-cur [www-brow 2.8.8dev.7-1 Text-mode WWW Browser with NLS sup
ii lzma 4.43-14 Compression method of 7z format in
ii man-db 2.5.7-8 on-line manual pager
ii mercurial 1.6.4-1 scalable distributed version contr
ii openssh-client [ss 1:5.5p1-6 secure shell (SSH) client, for sec
ii patch 2.6-3 Apply a diff file to an original
ii patchutils 0.3.1-2 Utilities to work with patches
ii sensible-utils 0.0.6 Utilities for sensible alternative
ii strace 4.5.20-2 A system call tracer
ii subversion 1.6.12dfsg-4 Advanced version control system
ii unzip 6.0-4 De-archiver for .zip files
ii w3m [www-browser] 0.5.2-10 WWW browsable pager with excellent
ii wdiff 0.6.3-1 Compares two files word by word
ii wget 1.12-2.1 retrieves files from the web
ii xz-utils 5.0.0-2 XZ-format compression utilities
Versions of packages devscripts suggests:
ii build-essential 11.5 Informational list of build-essent
pn cvs-buildpackage <none> (no description available)
pn devscripts-el <none> (no description available)
ii gnuplot 4.4.0-1.1 A command-line driven interactive
ii libfile-desktopentry-perl 0.04-2 Perl module to handle freedesktop
ii libnet-smtp-ssl-perl 1.01-2 SSL support for Net::SMTP
pn mutt <none> (no description available)
ii svn-buildpackage 0.8.3 helper programs to maintain Debian
ii w3m 0.5.2-10 WWW browsable pager with excellent
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEARECAAYFAk0xbKYACgkQ9ijrk0dDIGz3FQCfTM0Dfzt42yfjWch1dOFNtR5a
1cQAoNPX7otvKFBdtKLqiTuMYwmQ3Bmf
=1UqL
-----END PGP SIGNATURE-----
>From 588c722de545d5d80c94153836d4ce867cc8e974 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <nome...@debian.org>
Date: Sat, 15 Jan 2011 14:02:50 +0530
Subject: [PATCH] cowpoke: use rsync instead of scp
hopefully saving the copying of a few upstream tarballs.
---
debian/changelog | 1 +
debian/control | 6 +++---
scripts/cowpoke.sh | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a526daf..944079e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ devscripts (2.10.70) UNRELEASED; urgency=low
[ Joachim Breitner ]
* New option -n to debsnap: Do now download file, but show what would
be downloaded
+ * cowpoke: now uses rsync to transfer files.
-- James Vega <james...@debian.org> Thu, 02 Dec 2010 20:27:34 -0500
diff --git a/debian/control b/debian/control
index e2466e8..7601478 100644
--- a/debian/control
+++ b/debian/control
@@ -18,9 +18,9 @@ Recommends: at, curl | wget, dctrl-tools, debian-keyring,
debian-maintainers,
libcrypt-ssleay-perl, libparse-debcontrol-perl, libsoap-lite-perl,
libterm-size-perl, libtimedate-perl, liburi-perl, libwww-perl,
libyaml-syck-perl, lintian, lsb-release, bsd-mailx | mailx,
- man-db, patch, patchutils, ssh-client, strace, unzip, wdiff, www-browser,
- subversion | cvs | darcs | tla | bzr | git-core | mercurial, lzma,
- xz-utils, sensible-utils, libjson-perl
+ man-db, patch, patchutils, rsync, ssh-client, strace, unzip, wdiff,
+ www-browser, subversion | cvs | darcs | tla | bzr | git-core | mercurial,
+ lzma, xz-utils, sensible-utils, libjson-perl
Suggests: build-essential, cvs-buildpackage, devscripts-el, gnuplot,
libfile-desktopentry-perl, libnet-smtp-ssl-perl (>= 1.01-2), mutt,
svn-buildpackage, w3m
diff --git a/scripts/cowpoke.sh b/scripts/cowpoke.sh
index b5fe70f..347eba8 100755
--- a/scripts/cowpoke.sh
+++ b/scripts/cowpoke.sh
@@ -301,7 +301,7 @@ EOF
chmod 755 "$REMOTE_SCRIPT"
-dcmd scp $DSC "$REMOTE_SCRIPT" "$BUILDD_USER$BUILDD_HOST:$INCOMING_DIR"
+dcmd rsync -vP $DSC "$REMOTE_SCRIPT" "$BUILDD_USER$BUILDD_HOST:$INCOMING_DIR"
ssh -t "$BUILDD_USER$BUILDD_HOST" "\"$INCOMING_DIR/$REMOTE_SCRIPT\" && rm -f
\"$INCOMING_DIR/$REMOTE_SCRIPT\""
echo
--
1.7.2.3
