From: Don Armstrong Date: Fri, 11 Oct 2013 04:08:52 +0000 (-0700) Subject: fix repack to never repack X-Git-Url: https://git.donarmstrong.com/?p=cran2deb.git;a=commitdiff_plain;h=59285ed6284a13adc72fba3685acabfa23859ecf fix repack to never repack --- diff --git a/trunk/R/getrpkg.R b/trunk/R/getrpkg.R index 02266c4..266ee19 100644 --- a/trunk/R/getrpkg.R +++ b/trunk/R/getrpkg.R @@ -15,7 +15,7 @@ cleanup <- function(dir) { invisible() } -download_pkg <- function(dir, pkgname) { +download_pkg <- function(dir, pkgname, repacking=0) { # download pkgname into dir, and construct some metadata # record some basic information @@ -82,7 +82,8 @@ download_pkg <- function(dir, pkgname) { ,archive)) pkg$archive = archive # this is not a Debian conformant archive - pkg$need_repack = TRUE + ## we basically should never repack + ## pkg$need_repack = TRUE } return(pkg) } @@ -144,6 +145,12 @@ prepare_pkg <- function(dir, pkgname) { # if necessary, repack the archive into Debian-conformant format if (pkg$need_repack) { pkg <- repack_pkg(pkg) + } else { + log_system('ln','-sf',shQuote(pkg$archive), + shQuote(file.path(dirname(pkg$archive) + ,paste(pkg$srcname,'_' + ,pkg$version,'.orig.tar.gz' + ,sep='')))) } if (!file.info(pkg$path)[,'isdir']) { fail(pkg$path,'is not a directory and should be.')