tpkg 1.23.2 → 1.23.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/Rakefile +1 -1
  2. data/lib/tpkg.rb +3 -2
  3. data/lib/tpkg/metadata.rb +1 -1
  4. metadata +2 -2
data/Rakefile CHANGED
@@ -5,7 +5,7 @@ spec = Gem::Specification.new do |s|
5
5
  s.add_dependency('facter')
6
6
  s.add_dependency('net-ssh')
7
7
  s.add_dependency('ddao-kwalify')
8
- s.version = '1.23.2'
8
+ s.version = '1.23.3'
9
9
  s.authors = ['Darren Dao', 'Jason Heiss']
10
10
  s.email = 'tpkg-users@lists.sourceforge.net'
11
11
  s.homepage = 'http://tpkg.sourceforge.net'
data/lib/tpkg.rb CHANGED
@@ -56,7 +56,7 @@ require 'kwalify' # for validating yaml
56
56
 
57
57
  class Tpkg
58
58
 
59
- VERSION = '1.23.2'
59
+ VERSION = '1.23.3'
60
60
  CONFIGDIR = '/etc'
61
61
 
62
62
  GENERIC_ERR = 1
@@ -125,7 +125,7 @@ class Tpkg
125
125
  # will do. However, on older gnu tar, it only threw an error at the end. The work
126
126
  # around is to explicitly tell gnu tar to ignore those extensions.
127
127
  if @@tarinfo[:type] == 'gnu' && @@tarinfo[:version] != 'unknown' && @@tarinfo[:version] >= '1.15.1'
128
- @@taroptions = "--pax-option='delete=SCHILY.*'"
128
+ @@taroptions = "--pax-option='delete=SCHILY.*,delete=LIBARCHIVE.*'"
129
129
  end
130
130
  @@tar.dup
131
131
  end
@@ -2404,6 +2404,7 @@ class Tpkg
2404
2404
  rescue => e
2405
2405
  # Tell the user which external and package were involved, otherwise
2406
2406
  # failures in externals are very hard to debug
2407
+ # FIXME: should we clean up the external request files?
2407
2408
  raise Tpkg.wrap_exception(e, "External #{name} #{operation} for #{File.basename(pkgfile)}: " + e.message)
2408
2409
  end
2409
2410
  when :remove
data/lib/tpkg/metadata.rb CHANGED
@@ -488,7 +488,7 @@ class Metadata
488
488
  external = {}
489
489
  external[:name] = extxml.elements['name'].text
490
490
  if extxml.elements['data']
491
- external[:data] = extxml.elements['data'].text
491
+ external[:data] = extxml.elements['data'].children.to_s
492
492
  elsif extxml.elements['datafile']
493
493
  # We don't have access to the package contents here, so we just save
494
494
  # the name of the file and leave it up to others to read the file
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tpkg
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.23.2
4
+ version: 1.23.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Darren Dao
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2010-05-17 00:00:00 +00:00
13
+ date: 2010-05-20 00:00:00 +00:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency