From c3d9e9e078fe6a345499bb51d65bc20b48052c5c Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 20 Nov 2017 09:49:50 -0500 Subject: [PATCH] new: calibre_debs_on_debian to test Rasp approach on Debian --- 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 facf26fbf..5b999d9f1 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -3,13 +3,13 @@ # 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 + when: (not is_rpi) and (not calibre_debs_on_debian) #when: is_redhat or is_ubuntu - name: Install Calibre via .debs (Raspbian) include_tasks: debs.yml - when: is_rpi - #when: is_rpi or is_debian #is_debian apparently also covers is_rpi + when: is_rpi or 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)