From 92d2813de897e181448bb6cb0df22150f6f1b8e3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 27 Jun 2018 16:52:14 -0400 Subject: [PATCH 1/2] Update main.yml --- roles/calibre/tasks/main.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 74c10c428..722012e7c 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -5,14 +5,15 @@ path: "/usr/bin/calibre" register: calib_executable -- 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) +# The 8 lines below appear unecessary as of 2018-06-26 -- as tested on RPi. +#- 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 From 66529815f9a804c12ae8c446974a8deeb6c6b7bf Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 11 Jul 2018 00:20:07 -0400 Subject: [PATCH 2/2] Update main.yml --- roles/calibre/tasks/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 722012e7c..e84467bb6 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -5,7 +5,11 @@ path: "/usr/bin/calibre" register: calib_executable -# The 8 lines below appear unecessary as of 2018-06-26 -- as tested on RPi. +# 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 }}"