From 56e8346faa75fc42f65d11ea3569a3e5bdd252ec Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 22 Dec 2015 20:53:11 +0100
Subject: [PATCH] k 5 krebs-ci: remove obsolete trap rm
---
krebs/3modules/buildbot/master.nix | 2 +-
krebs/5pkgs/krebs-ci/notes | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index 2f73e44bc..e66e0d6b2 100644
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@@ -44,7 +44,7 @@ let
# files everyone depends on or are part of the share branch
def shared_files(change):
- r =re.compile("^((krebs|share)/.*|Makefile|default.nix)")
+ r =re.compile("^((krebs|shared)/.*|Makefile|default.nix)")
for file in change.files:
if r.match(file):
return True
diff --git a/krebs/5pkgs/krebs-ci/notes b/krebs/5pkgs/krebs-ci/notes
index 7e34d6a28..f6b193ddb 100755
--- a/krebs/5pkgs/krebs-ci/notes
+++ b/krebs/5pkgs/krebs-ci/notes
@@ -19,7 +19,7 @@ krebs_secrets=$(mktemp -d)
sec_file=$krebs_secrets/cac_config
krebs_ssh=$krebs_secrets/tempssh
# we need to receive this key from buildmaster to speed up tinc bootstrap
-TRAP="rm $sec_file;rm -r $krebs_secrets"
+TRAP="rm -r $krebs_secrets"
trap "$TRAP" INT TERM EXIT
cat > $sec_file <<EOF