From d2d10d07b0b7d45798d9a86b9b806ec5a17688de Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 26 Nov 2017 21:34:37 -0500 Subject: [PATCH] fix calibre_debs_on_debian conditionals --- roles/calibre/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 5b999d9f1..25d91934d 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -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)