From 3ffb82becc03184a1b23a3fa8304da0eb2ea85f3 Mon Sep 17 00:00:00 2001 From: Leo P Date: Tue, 1 Dec 2015 15:38:11 -0500 Subject: [PATCH 1/2] 'group' field may be absent in a pacman package, which prevented a valid build --- lib/fpm/package/pacman.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fpm/package/pacman.rb b/lib/fpm/package/pacman.rb index eebc9eb425..33455e21ec 100644 --- a/lib/fpm/package/pacman.rb +++ b/lib/fpm/package/pacman.rb @@ -136,7 +136,7 @@ def input(pacman_pkg_path) # Speaking of just taking the first entry of the field: # A crude thing to do, but I suppose it's better than nothing. # -- Daniel Haskin, 3/24/2015 - self.category = control["group"][0] || self.category + self.category = control["group"] && control["group"][0] || self.category # Licenses could include more than one. # Speaking of just taking the first entry of the field: From 701c9718554877bc90ec1cb552800b8dc0f0f664 Mon Sep 17 00:00:00 2001 From: Leo P Date: Thu, 3 Dec 2015 00:32:17 -0500 Subject: [PATCH 2/2] skip auto deps for arch linux package source if no_auto_depends is present --- lib/fpm/package/pacman.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/fpm/package/pacman.rb b/lib/fpm/package/pacman.rb index 33455e21ec..1a26d944bd 100644 --- a/lib/fpm/package/pacman.rb +++ b/lib/fpm/package/pacman.rb @@ -163,6 +163,10 @@ def input(pacman_pkg_path) end self.dependencies = control["depend"] || self.dependencies + + if attributes[:no_auto_depends?] + self.dependencies = [] + end self.attributes[:pacman_optional_depends] = control["optdepend"] || [] # There are other available attributes, but I didn't include them because: