[23063] in Source-Commits
/svn/athena r22726 - trunk/debathena/scripts
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Wed Jan 30 21:34:26 2008
Date: Wed, 30 Jan 2008 21:34:14 -0500 (EST)
From: ghudson@MIT.EDU
Message-Id: <200801310234.VAA14987@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-01-30 21:34:14 -0500 (Wed, 30 Jan 2008)
New Revision: 22726
Modified:
trunk/debathena/scripts/dasource
Log:
* debathena/scripts/dasource: Don't create an orig archive if the
package version contains no Debian component. We were checking
that prior to r22720 but that check was removed due to confusion
on my part. We need it for the config and meta packages which are
Debian-native.
Modified: trunk/debathena/scripts/dasource
===================================================================
--- trunk/debathena/scripts/dasource 2008-01-31 02:30:41 UTC (rev 22725)
+++ trunk/debathena/scripts/dasource 2008-01-31 02:34:14 UTC (rev 22726)
@@ -79,16 +79,19 @@
;;
esac
- tarfile=${pkgname}_$upver.orig.tar.gz
- if [ ! -e $pkgname/$tarfile ]; then
- aptorig=$(find ${DEBATHENA_APT}*/pool -name $tarfile | head -1)
- if [ -n "$aptorig" ]; then
- echo "Copying existing $aptorig to original source"
- cp $aptorig $pkgname/$tarfile
- else
- echo "Creating original source archive"
- (cd $pkgname && tar --exclude=.svn --exclude=debian $correctname -czf \
- $tarfile ${pkgname}-$upver)
+ # If the version has a debian component then we need an orig archive.
+ if [ $sver != $upver ]; then
+ tarfile=${pkgname}_$upver.orig.tar.gz
+ if [ ! -e $pkgname/$tarfile ]; then
+ aptorig=$(find ${DEBATHENA_APT}*/pool -name $tarfile | head -1)
+ if [ -n "$aptorig" ]; then
+ echo "Copying existing $aptorig to original source"
+ cp $aptorig $pkgname/$tarfile
+ else
+ echo "Creating original source archive"
+ (cd $pkgname && tar --exclude=.svn --exclude=debian $correctname -czf \
+ $tarfile ${pkgname}-$upver)
+ fi
fi
fi
