tpkg 1.27.1 → 1.27.3

data/Rakefile

@@ -5,7 +5,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('facter')
   s.add_dependency('net-ssh')
   s.add_dependency('ddao-kwalify')
-  s.version = '1.27.1'
+  s.version = '1.27.3'
   s.authors = ['Darren Dao', 'Jason Heiss']
   s.email = 'tpkg-users@lists.sourceforge.net'
   s.homepage = 'http://tpkg.sourceforge.net'

data/bin/cpan2tpkg

@@ -325,6 +325,7 @@ MODULE: foreach my $name ($extinst->modules)
 	print $xmlfh "  <name>cpan-perl$majorminor-$pkgname</name>", "\n";
 	print $xmlfh "  <version>$ver</version>", "\n";
 	print $xmlfh "  <package_version>$pkgver</package_version>", "\n";
+	print $xmlfh "  <description>cpan package for $pkgname</description>", "\n";
 	print $xmlfh '  <maintainer>cpan2tpkg</maintainer>', "\n";
 	# If the package has native code then it needs to be flagged as
 	# specific to the OS and architecture

data/bin/gem2tpkg

@@ -397,6 +397,7 @@ def package(gem)
     file.puts "  <name>gem-#{gem}#{pkgnamesuffix}</name>"
     file.puts "  <version>#{gemspec.version.to_s}</version>"
     file.puts "  <package_version>#{@pkgver}</package_version>"
+    file.puts "  <description>Ruby gem for #{gem}</description>"
     file.puts '  <maintainer>gem2tpkg</maintainer>'
     # If the gemspec lists any extensions then the package has native
     # code and needs to be flagged as specific to the OS and architecture

data/lib/tpkg.rb

@@ -56,7 +56,7 @@ require 'kwalify'        # for validating yaml
 
 class Tpkg
   
-  VERSION = '1.27.1'
+  VERSION = '1.27.3'
   CONFIGDIR = '/etc'
 
   GENERIC_ERR = 1  
@@ -316,7 +316,8 @@ class Tpkg
       File.open(File.join(tpkgdir, "file_metadata.bin"), "w") do |file|
         filemetadata = get_filemetadata_from_directory(tpkgdir)
         filemetadata[:files].each do |file1|
-          if metadata[:files][:files] && metadata[:files][:files].any?{|file2|file2[:path] == file1[:path] && file2[:config]}
+          if metadata[:files] && metadata[:files][:files] && 
+             metadata[:files][:files].any?{|file2|file2[:path] == file1[:path] && file2[:config]}
             file1[:config] = true
           end 
         end
@@ -1269,12 +1270,11 @@ class Tpkg
     @installed_directory = File.join(@var_directory, 'installed')
     @metadata_directory = File.join(@installed_directory, 'metadata')
     @sources_directory = File.join(@var_directory, 'sources')
-    @external_directory = File.join(@var_directory, 'externals')
     @tmp_directory = File.join(@var_directory, 'tmp')
     @log_directory = File.join(@var_directory, 'logs')
     # It is important to create these dirs in correct order
     dirs_to_create = [@installed_directory, @metadata_directory, @sources_directory, 
-                      @external_directory, @tmp_directory, @log_directory]
+                      @tmp_directory, @log_directory]
     dirs_to_create.each do |dir|
       if !File.exist?(dir)
         begin
@@ -1285,6 +1285,7 @@ class Tpkg
       end
     end
     @tar = Tpkg::find_tar
+    @external_directory = File.join(@file_system_root, 'usr', 'lib', 'tpkg', 'externals')
     @lock_directory = File.join(@var_directory, 'lock')
     @lock_pid_file = File.join(@lock_directory, 'pid')
     @locks = 0

data/lib/tpkg/metadata.rb

@@ -334,29 +334,34 @@ class Metadata
 
   # Add tpkg_version to the existing tpkg.xml or tpkg.yml file
   def add_tpkg_version(version)
-    if @format == 'xml'
-      metadata_xml = REXML::Document.new(@metadata_text)
-      if metadata_xml.root.elements["tpkg_version"] && (tpkg_version = metadata_xml.root.elements["tpkg_version"].text) != Tpkg::VERSION
-        warn "Warning: tpkg_version is specified as #{tpkg_version}, which doesn't match with the actual tpkg version being used (#{Tpkg::VERSION})."
-      elsif !metadata_xml.root.elements["tpkg_version"]
-        tpkg_version_ele = REXML::Element.new("tpkg_version")
-        tpkg_version_ele.text = Tpkg::VERSION
-        metadata_xml.root.add_element(tpkg_version_ele)  
-        File.open(@file_path, 'w') do |file|
-          metadata_xml.write(file)
+    begin
+      if @format == 'xml'
+        metadata_xml = REXML::Document.new(@metadata_text)
+        if metadata_xml.root.elements["tpkg_version"] && (tpkg_version = metadata_xml.root.elements["tpkg_version"].text) != Tpkg::VERSION
+          warn "Warning: tpkg_version is specified as #{tpkg_version}, which doesn't match with the actual tpkg version being used (#{Tpkg::VERSION})."
+        elsif !metadata_xml.root.elements["tpkg_version"]
+          tpkg_version_ele = REXML::Element.new("tpkg_version")
+          tpkg_version_ele.text = Tpkg::VERSION
+          metadata_xml.root.add_element(tpkg_version_ele)  
+          File.open(@file_path, 'w') do |file|
+            metadata_xml.write(file)
+          end
         end
+      elsif @format == 'yml'
+        if (tpkg_version = to_hash[:tpkg_version]) && tpkg_version != Tpkg::VERSION
+          warn "Warning: tpkg_version is specified as #{tpkg_version}, which doesn't match with the actual tpkg version being used (#{Tpkg::VERSION})."
+        elsif !tpkg_version
+          File.open(@file_path, 'a') do |file|
+            file.puts "tpkg_version: #{Tpkg::VERSION}"
+          end 
+        end
+      else
+        raise "Unknown metadata format"
       end
-    elsif @format == 'yml'
-      if (tpkg_version = to_hash[:tpkg_version]) && tpkg_version != Tpkg::VERSION
-        warn "Warning: tpkg_version is specified as #{tpkg_version}, which doesn't match with the actual tpkg version being used (#{Tpkg::VERSION})."
-      elsif !tpkg_version
-        File.open(@file_path, 'a') do |file|
-          file.puts "tpkg_version: #{Tpkg::VERSION}"
-        end 
-      end
-    else
-      raise "Unknown metadata format"
-    end
+    rescue Errno::EACCES => e
+      warn "Warning: Failed to insert tpkg_version into tpkg.(xml|yml)."
+      puts e
+    end 
   end
 
   def generate_package_filename

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tpkg
 version: !ruby/object:Gem::Version 
-  version: 1.27.1
+  version: 1.27.3
 platform: ruby
 authors: 
 - Darren Dao
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 +00:00
+date: 2010-08-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency