Skip to content

Prevent default fromrepo being evaluated as string 'None' #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 6, 2018
Merged

Prevent default fromrepo being evaluated as string 'None' #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bfb158c
Prevent default `fromrepo` being evaluated as string 'None'
myii Jun 6, 2018
6a77bbb
Prevent remaining defaults from being evaluated as string 'None'
myii Jun 6, 2018
2c6483f
Use `default` filter for `fromrepo` instead of `or`
myii Jun 6, 2018
cdca910
Add `fromrepo` to `pillar.example`
myii Jun 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pillar.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions postgres/codenamemap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand All @@ -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 %}
Expand Down
8 changes: 4 additions & 4 deletions postgres/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -57,7 +57,7 @@ postgres:

bake_image: False

fromrepo:
fromrepo: ''

users: {}
tablespaces: {}
Expand All @@ -67,4 +67,4 @@ postgres:

linux:
#Alternatives system are disabled by a 'altpriority=0' pillar.
altpriority:
altpriority: 0