From e29c4df98c52379fb1232d014675e2f30d1d1f19 Mon Sep 17 00:00:00 2001
From: Juan Orti Alcaine <j.orti.alcaine@gmail.com>
Date: Mon, 7 Dec 2020 12:52:40 +0100
Subject: [PATCH] Update packages installed in Fedora (#48)

Remove Fedora 31 as it's EOL and use the borgbackup, borgmatic and
cython packages from Fedora's repositories.
---
 tasks/main.yml     |  1 +
 vars/Fedora-31.yml | 21 ---------------------
 vars/Fedora.yml    | 18 ++++++++----------
 3 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 vars/Fedora-31.yml

diff --git a/tasks/main.yml b/tasks/main.yml
index 61bf46a..766eb77 100755
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -29,6 +29,7 @@
   pip:
     name: "{{ borg_python_packages }}"
     executable: "{{ pip_bin }}"
+  when: borg_python_packages is defined
 
 - name: Ensure root has SSH key.
   user:
diff --git a/vars/Fedora-31.yml b/vars/Fedora-31.yml
deleted file mode 100644
index 90b9760..0000000
--- a/vars/Fedora-31.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-borg_packages:
-  - libacl-devel
-  - libacl
-  - gcc
-  - gcc-c++
-  - openssl-devel
-  - python3-pip
-  - python3-wheel
-  - python3-devel
-  - python3-setuptools
-  - openssh-clients
-  - cronie
-
-python_bin: python3
-pip_bin: pip3
-
-borg_python_packages:
-  - cython
-  - borgbackup
-  - borgmatic
diff --git a/vars/Fedora.yml b/vars/Fedora.yml
index def08f2..cee4b4c 100644
--- a/vars/Fedora.yml
+++ b/vars/Fedora.yml
@@ -5,17 +5,15 @@ borg_packages:
   - gcc
   - gcc-c++
   - openssl-devel
-  - python-pip
-  - python-wheel
-  - python-devel
-  - python-setuptools
+  - python3-pip
+  - python3-wheel
+  - python3-devel
+  - python3-setuptools
+  - python3-Cython
   - openssh-clients
   - cronie
-
-python_bin: python
-pip_bin: pip
-
-borg_python_packages:
-  - cython
   - borgbackup
   - borgmatic
+
+python_bin: python3
+pip_bin: pip3