Commit ba186e31 authored by Matt Travers's avatar Matt Travers

BF: Fixed several issues including how TMP_DIR is handled, using neurodebian...

BF: Fixed several issues including how TMP_DIR is handled, using neurodebian docker images, and condtinuing on assert fail
parent 0fbd9b80
......@@ -81,7 +81,11 @@ sub get_www_content {
# Function to run apt-get update
sub run_apt_get_update {
info("Refreshing apt cache ...");
qx/apt-get update --no-allow-insecure-repositories/;
if (qx!grep ubuntu /etc/os-release!) {
qx/apt-get update --no-allow-insecure-repositories/;
} else {
qx/apt-get update/;
}
}
......@@ -266,7 +270,7 @@ sub write_snapshot_sources {
$next_timestamp =~ tr/\///d;
if ($user_timestamp gt $next_timestamp) {
# Notify user that they have requested a date beyond the most recent snapshot.
info "User provided time (${user_timestamp}) later than latest snapshot available (${next_timestamp}).";
info "WARNING: User specified time (${user_timestamp}) later than latest snapshot available (${next_timestamp}). Skipping archive http://${domain}/archive/${sources{$key}{repo}}/${next_timestamp}/";
next;
}
print $fp "deb http://${domain}/archive/${sources{$key}{repo}}/${next_timestamp}/ ${sources{$key}{archive}} ${sources{$key}{type}}\n";
......@@ -310,7 +314,6 @@ sub disable_lines {
$_ =~ /http:\/\/[^\/]+\/(.*)$/;
my $file_line = join ' ', sort split /\s+/, $1;
$sources{$key}{repo} = 'debian' if $sources{$key}{repo} eq 'neurodebian';
$sources{$key}{type} .= ' contrib' if ($key eq 'NeuroDebian|neurodebian|data' and !($sources{$key}{type} =~ /contrib/));
my $source_line = join ' ', sort split /\s+/, "$sources{$key}{repo} $sources{$key}{archive} $sources{$key}{type}";
if ($file_line eq $source_line) {
$found = 1;
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment