external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #569 from holta/calibre-fix

Browse source 
Fix calibre_debs_on_debian conditionals
This commit is contained in:
A Holt 2017-11-26 21:39:09 -05:00 • committed by GitHub
commit 734548f19e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/calibre/tasks/main.yml
View file

@ -3,12 +3,12 @@
# RUNS IF /usr/bin/calibre-uninstall DOES NOT ALEADY EXIST
- name: Install Calibre via calibre-installer.py (OS's other than Raspbian)
include_tasks: py-installer.yml
when: (not is_rpi) and (not calibre_debs_on_debian)
#when: is_redhat or is_ubuntu
when: is_redhat or is_ubuntu or (is_debian and not calibre_debs_on_debian)
#when: not is_rpi
- name: Install Calibre via .debs (Raspbian)
include_tasks: debs.yml
when: is_rpi or calibre_debs_on_debian
when: is_rpi or (is_debian and calibre_debs_on_debian)
#when: is_rpi or is_debian # (is_debian also covers & includes is_rpi)
# 2. STOP CALIBRE SERVICE IF IT EXISTS (REQUIRED FOR DB ACTIVITY...AND IF not calibre_enabled)