From 67a689f217b2c134a305764e0eac6946b20617d4 Mon Sep 17 00:00:00 2001 From: mudler Date: Sun, 6 Mar 2016 20:37:02 +0100 Subject: [PATCH] [builder sabayon-buildpackages] renaming SKIP_SYNC in SKIP_PORTAGE_SYNC --- builder | 4 ++-- sabayon-buildpackages | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builder b/builder index 0a82963..11da60e 100755 --- a/builder +++ b/builder @@ -18,7 +18,7 @@ my $equo_mirrorsort = $ENV{EQUO_MIRRORSORT} // 1; my $entropy_repository = $ENV{ENTROPY_REPOSITORY} // "main"; # Can be weekly, main, testing my $artifacts_folder = $ENV{ARTIFACTS_DIR}; my $dep_scan_depth = $ENV{DEPENDENCY_SCAN_DEPTH} // 2; -my $skip_sync = $ENV{SKIP_SYNC} // 0; +my $skip_portage_sync = $ENV{SKIP_PORTAGE_SYNC} // 0; my $webrsync = $ENV{WEBRSYNC} // 0; my $make_conf = $ENV{MAKE_CONF}; @@ -174,7 +174,7 @@ auto-sync = no' > /etc/portage/repos.conf/local.conf system("mkdir -p /usr/portage/distfiles/git3-src"); -unless($skip_sync == 1){ +unless($skip_portage_sync == 1){ # sync portage and overlays system("layman -S"); if($webrsync == 1){ diff --git a/sabayon-buildpackages b/sabayon-buildpackages index 6f2bb24..32d37ca 100755 --- a/sabayon-buildpackages +++ b/sabayon-buildpackages @@ -34,7 +34,7 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" ) [ -z "$EQUO_SPLIT_INSTALL" ] || docker_env+=(-e "EQUO_SPLIT_INSTALL=$EQUO_SPLIT_INSTALL") [ -z "$ARTIFACTS_DIR" ] || docker_env+=(-e "ARTIFACTS_DIR=$ARTIFACTS_DIR") [ -z "$ENTROPY_REPOSITORY" ] || docker_env+=(-e "ENTROPY_REPOSITORY=$ENTROPY_REPOSITORY") -[ -z "$SKIP_SYNC" ] || docker_env+=(-e "SKIP_SYNC=$SKIP_SYNC") +[ -z "$SKIP_PORTAGE_SYNC" ] || docker_env+=(-e "SKIP_PORTAGE_SYNC=$SKIP_PORTAGE_SYNC") [ -z "$WEBRSYNC" ] || docker_env+=(-e "WEBRSYNC=$WEBRSYNC") [ -z "$DISTFILES" ] || docker_volumes+=(-v "$DISTFILES:/usr/portage/distfiles") [ -z "$ENTROPY_DOWNLOADED_PACKAGES" ] || docker_volumes+=(-v "$ENTROPY_DOWNLOADED_PACKAGES:/var/lib/entropy/client/packages")