From 93a1cbc0c3334afd839791c457b3ec914e58a389 Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Fri, 28 Feb 2020 16:27:00 +0100 Subject: [PATCH 1/3] fix for regression introduced by 60e7afe as mentioned in #479 --- lib/ZnapZend/Config.pm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/ZnapZend/Config.pm b/lib/ZnapZend/Config.pm index ca7d7fa0..6bc42493 100644 --- a/lib/ZnapZend/Config.pm +++ b/lib/ZnapZend/Config.pm @@ -89,17 +89,6 @@ my $checkBackupSets = sub { next; } - if ( $dataSet =~ m/[\@]/ ) { - # If we are here, somebody fed us a snapshot in the list of - # datasets, which is likely a bug elsewhere in discovery. - # We do not want to fail whole backup below due to faulted - # dataSetExists() below, so just ignore this entry. - # If we really do get here, take a hard look at recursive - # and/or inherited modes for run-once. - print STDERR "#checkBackupSets# SKIP $backupSet->{src} because it is not a filesystem,volume. BUG: Should not get here.\n";# if $self->debug; - next; - } - for my $prop (keys %{$self->mandProperties}){ exists $backupSet->{$prop} || do { $self->zLog->info("WARNING: property $prop not set on backup for " . $backupSet->{src} . ". Skipping to next dataset"); From 91cf4215a05965539ae1fabe05647664dbf95623 Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Fri, 28 Feb 2020 16:28:53 +0100 Subject: [PATCH 2/3] only run push on master --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d137d1d2..38b4800d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ name: Test on: push: branches: - - "*" + - master tags-ignore: - "*" pull_request: From 7629a0243b587fe50215336bac41396e9388e759 Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Fri, 28 Feb 2020 16:44:05 +0100 Subject: [PATCH 3/3] run on all pullrequests --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 38b4800d..cae3f36b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,8 +7,7 @@ on: tags-ignore: - "*" pull_request: - types: [opened, reopened] - + jobs: unit: runs-on: ubuntu-latest