diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index ac64a8165..7207cf670 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -20,10 +20,11 @@ calibre_sample_book: "Metamorphosis-jackson.epub" calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py" calibre_deb_url: http://download.iiab.io/packages -# Must contain both packages for the pinned version, formatted as follows: -# calibre_3.31.0+dfsg-1_all.deb (25M, 2018-09-07) -# calibre-bin_3.31.0+dfsg-1_armhf.deb (747K, 2018-09-12) -calibre_deb_pin_version: 3.31.0+dfsg-1 +# Must contain both packages, corresponding with variable value(s) below, for scripts/calibre-install-pinned-rpi.sh to run: +# calibre_3.32.0+dfsg-1_all.deb (25M, 2018-09-28) +# calibre-bin_3.32.0+dfsg-1_armhf.deb (707K, 2018-10-08) WORKS DESPITE BEING 11H EARLIER? FAILS: calibre-bin_3.32.0+dfsg-1+b1_armhf.deb (707K, 2018-10-08) +calibre_deb_pin_version: 3.32.0+dfsg-1 +calibre_bin_deb_pin_version: 3.32.0+dfsg-1 # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index e00b46e0b..6638bd29a 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -43,7 +43,7 @@ timeout: "{{ download_timeout }}" with_items: - calibre_{{ calibre_deb_pin_version }}_all.deb - - calibre-bin_{{ calibre_deb_pin_version }}_armhf.deb + - calibre-bin_{{ calibre_bin_deb_pin_version }}_armhf.deb when: is_rpi and internet_available - name: Install/Upgrade both, to PINNED version {{ calibre_deb_pin_version }} while using additional .deb's from testing (rpi)