From cdbe0ea4a758251a208d42bed07282dfe40ccca1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 11 Jul 2018 03:40:50 -0400 Subject: [PATCH] Revert "Avoiding OS's ancient version(s) of Calibre (blocks install on Ubuntu 16.04, slows others)" --- roles/calibre/tasks/main.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 88b848bc4..5cfb310d0 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -5,19 +5,14 @@ path: "/usr/bin/calibre" register: calib_executable -# The 8 lines below were breaking IIAB installs on Ubuntu 16.04 as of early -# July 2018 (https://github.com/iiab/iiab/issues/883) and were tested as -# unecessary on Raspbian Lite on RPi 3 B+ (calibre_via-debs: True) and -# Ubuntu 18.04 (calibre_via_python: True). PR #856 is the fix for now. - -#- name: Install Calibre via OS's package installer (IF /usr/bin/calibre MISSING) -# package: -# name: "{{ item }}" -# state: latest -# with_items: -# - calibre -# - calibre-bin -# when: internet_available and (not calib_executable.stat.exists) +- name: Install Calibre via OS's package installer (IF /usr/bin/calibre MISSING) + package: + name: "{{ item }}" + state: latest + with_items: + - calibre + - calibre-bin + when: internet_available and (not calib_executable.stat.exists) - name: Install Calibre experimental .debs IF calibre_via_debs (AND /usr/bin/calibre WAS MISSING) include_tasks: debs.yml