Skip to content

Commit 6628f17

Browse files
alxwrjordansissel
authored andcommitted
Dir#input: don't overwrite license and vendor
Calling Dir#input overwrote #license and #vendor with default values.
1 parent 69cb62d commit 6628f17

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/fpm/package/dir.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ def input(path)
8383
# can include license data from themselves (rpms, gems, etc),
8484
# but to make sure a simple dir -> rpm works without having
8585
# to specify a license.
86-
self.license = "unknown"
87-
self.vendor = [ENV["USER"], Socket.gethostname].join("@")
86+
self.license ||= "unknown"
87+
self.vendor ||= [ENV["USER"], Socket.gethostname].join("@")
8888
ensure
8989
# Clean up any logger context we added.
9090
logger.remove("method")

0 commit comments

Comments
 (0)