comparison sources/functions.sh @ 761:93149f07231f

Blank ARCH is a bad signal because host-tools.sh has that, so use a separate EXTRACT_ONLY variable.
author Rob Landley <rob@landley.net>
date Wed, 24 Jun 2009 13:02:03 -0500
parents 2537f30c2397
children 879cf963cdbb
comparison
equal deleted inserted replaced
760:2537f30c2397 761:93149f07231f
233 fi 233 fi
234 234
235 # Preemptively extract source packages? 235 # Preemptively extract source packages?
236 236
237 [ -z "$EXTRACT_ALL" ] && return 0 237 [ -z "$EXTRACT_ALL" ] && return 0
238 ARCH="" setupfor "$(basename "$FILENAME")" 238 EXTRACT_ONLY=1 setupfor "$(basename "$FILENAME")"
239 return $? 239 return $?
240 fi 240 fi
241 241
242 return 1 242 return 1
243 } 243 }
375 # Make sure the source is already extracted and up-to-date. 375 # Make sure the source is already extracted and up-to-date.
376 cd "${SRCDIR}" && 376 cd "${SRCDIR}" &&
377 extract "${PACKAGE}-"*.tar* || exit 1 377 extract "${PACKAGE}-"*.tar* || exit 1
378 378
379 # If all we want to do is extract source, bail out now. 379 # If all we want to do is extract source, bail out now.
380 [ -z "$ARCH" ] && return 0 380 [ ! -z "$EXTRACT_ONLY" ] && return 0
381 381
382 # Set CURSRC 382 # Set CURSRC
383 CURSRC="$PACKAGE" 383 CURSRC="$PACKAGE"
384 if [ ! -z "$3" ] 384 if [ ! -z "$3" ]
385 then 385 then
450 { 450 {
451 if unstable "$1" 451 if unstable "$1"
452 then 452 then
453 # Need to extract unstable packages to determine source control version. 453 # Need to extract unstable packages to determine source control version.
454 454
455 ARCH="" setupfor "$1" >&2 455 EXTRACT_ONLY=1 setupfor "$1" >&2
456 DIR="${BUILD}/sources/alt-$1" 456 DIR="${BUILD}/sources/alt-$1"
457 457
458 if [ -d "$DIR/.svn" ] 458 if [ -d "$DIR/.svn" ]
459 then 459 then
460 ( cd "$DIR"; echo subversion rev \ 460 ( cd "$DIR"; echo subversion rev \