belliash 7 years ago
parent
commit
087d59e2d4
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      libraries/repositories

+ 3
- 3
libraries/repositories View File

@@ -321,10 +321,10 @@ function pushRepository() {
321 321
 #-------------------------------------------------------------------------------
322 322
 function snapshotPortage() {
323 323
 	local SOURCE="${1}"
324
-	local TARBALL="portage-$(date +${TARBALLDATE}).tar.${TARBALLFORMAT}"
324
+	local TARBALL="portage-$(date +${TARBALLDATE}).tar"
325 325
 	if [ ! -d ${SNAPSHOTSDIR} ]; then
326 326
 		makeDirectory ${SNAPSHOTSDIR} || return 1
327
-	elif [ ! -f ${SNAPSHOTSDIR}/${TARBALL} ]; then
327
+	elif [ ! -f ${SNAPSHOTSDIR}/${TARBALL}.${TARBALLFORMAT} ]; then
328 328
 		rm -rf "${TEMPDIR}/portage"
329 329
 		case ${2} in
330 330
 			[Gg][Ii][Tt])
@@ -338,7 +338,6 @@ function snapshotPortage() {
338 338
 				return 1
339 339
 				;;
340 340
 		esac
341
-		TARBALL=${TARBALL%.*}
342 341
 		run "tar -c -C ${TEMPDIR} portage > ${SNAPSHOTSDIR}/${TARBALL}"
343 342
 		if [ ${?} -ne 0 ]; then
344 343
 			rm -f ${SNAPSHOTSDIR}/${TARBALL}
@@ -365,6 +364,7 @@ function snapshotPortage() {
365 364
 			return 1
366 365
 		fi
367 366
 	fi
367
+	TARBALL="${TARBALL}.${TARBALLFORMAT}"
368 368
 	if [ ! -f ${SNAPSHOTSDIR}/${TARBALL}.DIGESTS ]; then
369 369
 		cd ${SNAPSHOTSDIR}
370 370
 		generateDigests ${TARBALL}.DIGESTS ${TARBALL} || return 1

Loading…
Cancel
Save