diff --git a/roles/calibre/tasks/create-db.yml b/roles/calibre/tasks/create-db.yml index c2723d1d8..e6132da29 100644 --- a/roles/calibre/tasks/create-db.yml +++ b/roles/calibre/tasks/create-db.yml @@ -8,7 +8,7 @@ url: "{{ iiab_download_url }}/{{ calibre_sample_book }}" dest: "{{ content_base }}/downloads" timeout: "{{ download_timeout }}" - when: internet_available and not sample_bk.stat.exists + when: not sample_bk.stat.exists - name: Check if sample book exists in /opt/iiab/downloads stat: diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index bb620dd0a..9de9fe3d6 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -30,7 +30,7 @@ - name: Upgrade to latest Calibre using .deb's from testing (rpi) command: scripts/calibre-install-latest-rpi.sh # WORKED for Calibre 3.33.1 on 2018-10-23. And Calibre 3.28 on 2018-07-26 (PR #971). Likewise for Calibre 3.26.x. FAILED with Calibre 3.24+ ("calibre : Depends: python-pyqt5 (>= 5.10.1+dfsg-2) but 5.10.1+dfsg-1+rpi1 is to be installed") since June 2018. - when: is_raspbian and internet_available + when: is_raspbian #- name: Download PINNED version {{ calibre_deb_pin_version }} of calibre & calibre-bin (rpi) # get_url: @@ -49,10 +49,10 @@ - name: Install/Upgrade to Calibre testing .deb's (not rpi) command: scripts/calibre-install-latest.sh - when: (not is_raspbian) and internet_available + when: (not is_raspbian) #when: (not is_raspbian) and (is_debian_9 or is_ubuntu_16) and internet_available #when: not is_raspbian and not is_ubuntu_18 and internet_available - name: Install/Upgrade to Calibre unstable .deb's IF calibre_unstable_debs command: scripts/calibre-install-unstable.sh - when: calibre_unstable_debs and internet_available + when: calibre_unstable_debs diff --git a/roles/calibre/tasks/py-installer.yml b/roles/calibre/tasks/py-installer.yml index 29f9b3265..0673446cb 100644 --- a/roles/calibre/tasks/py-installer.yml +++ b/roles/calibre/tasks/py-installer.yml @@ -12,7 +12,6 @@ backup: yes timeout: "{{ download_timeout }}" register: calibre_download_output - when: internet_available # ALWAYS DEFINED, DESPITE get_url DOCUMENTATION CLAIM... # - debug: @@ -44,7 +43,7 @@ # meta: end_play fail: msg: "{{ downloads_dir }}/calibre-installer.py and an Internet connection are REQUIRED in order to install Calibre!" - when: (not calib_inst.stat.exists) or (not internet_available) + when: (not calib_inst.stat.exists) #when: (not calib_inst.stat.exists) or (not internet_available and not calib_uninst.stat.exists) # INSTALL THE LATEST CALIBRE (calibre, calibredb, calibre-server etc) @@ -53,4 +52,3 @@ shell: "{{ downloads_dir }}/calibre-installer.py >> /dev/null" #args: # creates: /usr/bin/calibre-uninstall - when: internet_available