Merge pull request #217 from myii/patch-2

Prevent default `fromrepo` being evaluated as string 'None'

Author: noelmcloughlin

pillar.example

@@ -4,6 +4,9 @@ postgres:
   use_upstream_repo: False
   # Version to install from upstream repository (if upstream_repo: True)
   version: '9.6'
+  # If automatic package installation fails, use `fromrepo` to specify the
+  # upstream repo to install packages from [#133, #185] (if upstream_repo: True)
+  fromrepo: 'jessie-pgdg'
 
   ### MACOS
   # Set to 'postgresapp' OR 'homebrew' for MacOS

postgres/codenamemap.yaml

@@ -13,7 +13,7 @@
   {# use upstream version if configured #}
   {% if repo.use_upstream_repo == true %}
     {% set version = repo.version %}
-    {% set fromrepo = repo.fromrepo or name + '-pgdg' %}
+    {% set fromrepo = repo.fromrepo|default(name ~ '-pgdg', true) %}
   {% else %}
     {% set fromrepo = name %}
   {% endif %}
@@ -38,7 +38,7 @@
 
   {# use upstream version if configured #}
   {% if repo.use_upstream_repo == true %}
-    {% set fromrepo = repo.fromrepo or name + '-pgdg' %}
+    {% set fromrepo = repo.fromrepo|default(name ~ '-pgdg', true) %}
     {% set version = repo.version %}
   {% else %}
     {% set fromrepo = name %}

postgres/defaults.yaml

@@ -32,8 +32,8 @@ postgres:
       url: https://github.com/PostgresApp/PostgresApp/releases/download/v2.1.1/Postgres-2.1.1.dmg
       sum: sha256=ac0656b522a58fd337931313f09509c09610c4a6078fe0b8e469e69af1e1750b
     homebrew:
-      url:
-      sum:
+      url: ''
+      sum: ''
     dl:
       opts: -s -L
       interval: 60
@@ -57,7 +57,7 @@ postgres:
 
   bake_image: False
 
-  fromrepo:
+  fromrepo: ''
 
   users: {}
   tablespaces: {}
@@ -67,4 +67,4 @@ postgres:
 
   linux:
     #Alternatives system are disabled by a 'altpriority=0' pillar.
-    altpriority:
+    altpriority: 0