Package: devscripts Version: 2.9.7 Severity: normal Tags: patch Hello,
I have a small problem using uupdate. Actually, when i specify in the command line '--no-symlink' : $ ls -l drwxr-xr-x [...] squashfs-2.1r2 -rw-r--r-- [...] squashfs_2.1r2-0.1.diff.gz -rw-r--r-- [...] squashfs_2.1r2-0.1.dsc -rw-r--r-- [...] squashfs_2.1r2.orig.tar.gz -rw-r--r-- [...] squashfs2.2-r2.tar.gz $ cd squashfs-2.1r2/ $ uupdate -u ../squashfs2.2-r2.tar.gz -v 2.2r2 --no-symlink # Or also : $ uupdate -u squashfs2.2-r2.tar.gz -v 2.2r2 --no-symlink New Release will be 1:2.2r2-1. Copying pristine source to squashfs_2.2r2.orig.tar.gz... cp: ne peut évaluer `squashfs2.2-r2.tar.gz': No such file or directory -- Untarring the new sourcecode archive squashfs2.2-r2.tar.gz [...] Without '--no-simlink' argument, everything works like a charm. I have traced the execution of the script using '-x' argument to Bash. It appers that LINKARCHIVE variable remove relative path, so using ARCHIVE_PATH instead of LINKARCHIVE only for cp command, it works fine. I have attached a small patch which works well for me. Greetings, Arnaud Fontaine -- System Information: Debian Release: testing/unstable APT prefers unstable APT policy: (990, 'unstable'), (500, 'testing') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.14-rc3-d500 Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15) Versions of packages devscripts depends on: ii debianutils 2.14.3 Miscellaneous utilities specific t ii dpkg-dev 1.13.11 package building tools for Debian ii libc6 2.3.5-6 GNU C Library: Shared libraries an ii perl 5.8.7-5 Larry Wall's Practical Extraction ii sed 4.1.4-4 The GNU sed stream editor Versions of packages devscripts recommends: ii fakeroot 1.5.4 Gives a fake root environment -- no debconf information -- Arnaud Fontaine <[EMAIL PROTECTED]> - http://www.andesi.org/ | GPG Public Key available on pgp.mit.edu | Fingerprint: D792 B8A5 A567 B001 C342 2613 BDF2 A220 5E36 19D3
--- uupdate.orig 2005-10-11 19:05:57.000000000 +0200
+++ uupdate 2005-10-11 19:26:42.000000000 +0200
@@ -540,26 +540,27 @@
! -e "../${PACKAGE}_$SNEW_VERSION.orig.tar.bz2" ]; then
if [ "$UUPDATE_SYMLINK_ORIG" = yes ]; then
echo "Symlinking to pristine source from ${PACKAGE}_$SNEW_VERSION.orig.tar.$TYPE..."
+
+ case $ARCHIVE_PATH in
+ /*) LINKARCHIVE="$ARCHIVE" ;;
+ ../*) LINKARCHIVE="${ARCHIVE#../}" ;;
+ esac
else
echo "Copying pristine source to ${PACKAGE}_$SNEW_VERSION.orig.tar.$TYPE..."
fi
- case $ARCHIVE_PATH in
- /*) LINKARCHIVE="$ARCHIVE" ;;
- ../*) LINKARCHIVE="${ARCHIVE#../}" ;;
- esac
case "$TYPE" in
gz)
if [ "$UUPDATE_SYMLINK_ORIG" = yes ]; then
ln -s "$LINKARCHIVE" "../${PACKAGE}_$SNEW_VERSION.orig.tar.gz"
else
- cp "$LINKARCHIVE" "../${PACKAGE}_$SNEW_VERSION.orig.tar.gz"
+ cp "$ARCHIVE_PATH" "../${PACKAGE}_$SNEW_VERSION.orig.tar.gz"
fi
;;
bz2)
if [ "$UUPDATE_SYMLINK_ORIG" = yes ]; then
ln -s "$LINKARCHIVE" "../${PACKAGE}_$SNEW_VERSION.orig.tar.bz2"
else
- cp "$LINKARCHIVE" "../${PACKAGE}_$SNEW_VERSION.orig.tar.bz2"
+ cp "$ARCHIVE_PATH" "../${PACKAGE}_$SNEW_VERSION.orig.tar.bz2"
fi
;;
*)
pgpMsM4D57DE6.pgp
Description: PGP signature
