aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--roles/pacman/tasks/main.yml6
-rw-r--r--roles/snap/tasks/main.yml6
2 files changed, 6 insertions, 6 deletions
diff --git a/roles/pacman/tasks/main.yml b/roles/pacman/tasks/main.yml
index 969f621..bbcdddc 100644
--- a/roles/pacman/tasks/main.yml
+++ b/roles/pacman/tasks/main.yml
@@ -25,7 +25,7 @@
msg: Upgrading packages failed for an unknown reason!
when: not etc_versioned
- - name: There are uncommitted changes
+ - name: Check for changes in /etc
command: git status --porcelain=v1
args:
chdir: /etc
@@ -37,7 +37,7 @@
msg: Upgrading packages failed for an unknown reason!
when: not git_status.stdout
- - name: All changes are pacman.d/gnupg
+ - name: All changes in /etc are in pacman.d/gnupg?
shell: git status --porcelain=v1 | cut -c 4- | grep -G -v '^pacman.d/gnupg/'
args:
chdir: /etc
@@ -45,7 +45,7 @@
changed_when: no
failed_when: no
- - name: Commit pacman.d/gnupg
+ - name: Commit changes in /etc
command: |
etckeeper commit 'pacman: GPG keys'
when: git_status.stdout and only_gnupg.rc != 0
diff --git a/roles/snap/tasks/main.yml b/roles/snap/tasks/main.yml
index 46fd3c5..007dbbe 100644
--- a/roles/snap/tasks/main.yml
+++ b/roles/snap/tasks/main.yml
@@ -7,7 +7,7 @@
- become: yes
when: snap_version.rc == 0 and etc_versioned
block:
- - name: There are uncommitted changes
+ - name: Check for changes in /etc
command: git status --porcelain=v1
args:
chdir: /etc
@@ -15,7 +15,7 @@
changed_when: no
failed_when: no
- - name: All changes are snap changes
+ - name: All changes in /etc are snap changes?
shell: git status --porcelain=v1 | cut -c 4- | grep -G -v '^systemd/system/' | grep -G -v '/snap\.\|snap-'
args:
chdir: /etc
@@ -23,6 +23,6 @@
changed_when: no
failed_when: no
- - name: Commit snap changes
+ - name: Commit changes in /etc
command: etckeeper commit 'after snap run'
when: git_status.stdout and only_snap.rc != 0