From 2d8a918109463402d5e7a5b093fefcb54d054840 Mon Sep 17 00:00:00 2001 From: Kenny Evitt Date: Fri, 25 Dec 2015 14:08:08 -0500 Subject: [PATCH] Handle potentially missing attributes for (currently) un-supported platforms. --- README.md | 2 +- attributes/default.rb | 2 +- recipes/debian_backports.rb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3fbcfdf..3de234a 100644 --- a/README.md +++ b/README.md @@ -243,7 +243,7 @@ default["postgresql"]["cfg_update_action"] = :restart #---------------------------------------------------------------------------- # APT REPOSITORY #---------------------------------------------------------------------------- -default["postgresql"]["apt_distribution"] = node["lsb"]["codename"] +default["postgresql"]["apt_distribution"] = node["lsb"] && node["lsb"]["codename"] default["postgresql"]["apt_repository"] = "apt.postgresql.org" default["postgresql"]["apt_uri"] = "http://apt.postgresql.org/pub/repos/apt" default["postgresql"]["apt_components"] = ["main"] diff --git a/attributes/default.rb b/attributes/default.rb index 2b486e4..d642e07 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -20,7 +20,7 @@ # APT REPOSITORY #------------------------------------------------------------------------------ -default["postgresql"]["apt_distribution"] = node["lsb"]["codename"] +default["postgresql"]["apt_distribution"] = node["lsb"] && node["lsb"]["codename"] default["postgresql"]["apt_repository"] = "apt.postgresql.org" default["postgresql"]["apt_uri"] = "http://apt.postgresql.org/pub/repos/apt" default["postgresql"]["apt_components"] = ["main", node["postgresql"]["version"]] diff --git a/recipes/debian_backports.rb b/recipes/debian_backports.rb index 87e1c8c..1ed32ae 100644 --- a/recipes/debian_backports.rb +++ b/recipes/debian_backports.rb @@ -4,7 +4,7 @@ # # backports for initial support -backports_uri = if node["lsb"]["codename"] == "wheezy" +backports_uri = if node["lsb"] && node["lsb"]["codename"] == "wheezy" "http://cdn.debian.net/debian" else "http://backports.debian.org/debian-backports" @@ -12,13 +12,13 @@ apt_repository "debian-backports" do uri backports_uri - distribution "#{node["lsb"]["codename"]}-backports" + distribution "#{node["lsb"] && node["lsb"]["codename"]}-backports" components ["main"] end # backports support for debian %w[libpq5 postgresql-common].each do |pkg| package pkg do - options "-t #{node["lsb"]["codename"]}-backports" + options "-t #{node["lsb"] && node["lsb"]["codename"]}-backports" end end