Permalink
Browse files

- There is no RPM::File#directories method, plus it seems like rpm

  doesn't even record the "%dir" data, instead it just packages an empty
  directory into the cpio.

  fixes #316, based on #325 (patch by rtucker-mozilla)
  • Loading branch information...
1 parent 2dead21 commit 65f6bb14a793f8c629478e7df5119492ec79ec8b @jordansissel committed Jan 2, 2013
Showing with 9 additions and 1 deletion.
  1. +9 −1 lib/fpm/package/rpm.rb
@@ -187,7 +187,15 @@ def input(path)
#input.replaces += replaces
self.config_files += rpm.config_files
- self.directories += rpm.directories
+
+ # rpms support '%dir' things for specifying empty directories to package,
+ # but the rpm header itself doesn't actually record this information.
+ # so there's no 'directories' to copy, so don't try to merge in the
+ # 'directories' feature.
+ # TODO(sissel): If you want this feature, we'll have to find scan
+ # the extracted rpm for empty directories. I'll wait until someone asks for
+ # this feature
+ #self.directories += rpm.directories
# Extract to the staging directory
rpm.extract(staging_path)

0 comments on commit 65f6bb1

Please sign in to comment.