tpkg 2.2.3 → 2.2.4

data/Rakefile

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

data/lib/tpkg.rb

@@ -40,7 +40,7 @@ require 'tpkg/metadata'
 
 class Tpkg
   
-  VERSION = '2.2.3'
+  VERSION = '2.2.4'
 
   GENERIC_ERR = 1  
   POSTINSTALL_ERR = 2
@@ -2474,7 +2474,11 @@ class Tpkg
   def run_external(pkgfile, operation, name, data)
     externalpath = File.join(@external_directory, name)
     if !File.executable?(externalpath)
-      raise "External #{externalpath} does not exist or is not executable"
+      if @force
+        warn "External #{externalpath} does not exist or is not executable"
+      else
+        raise "External #{externalpath} does not exist or is not executable"
+      end
     end
     case operation
     when :install
@@ -2489,7 +2493,11 @@ class Tpkg
         # Tell the user which external and package were involved, otherwise
         # failures in externals are very hard to debug
         # FIXME: should we clean up the external request files?
-        raise Tpkg.wrap_exception(e, "External #{name} #{operation} for #{File.basename(pkgfile)}: " + e.message)
+        if @force
+          warn "External #{name} #{operation} for #{File.basename(pkgfile)}: " + e.message
+        else
+          raise Tpkg.wrap_exception(e, "External #{name} #{operation} for #{File.basename(pkgfile)}: " + e.message)
+        end
       end
     when :remove
       begin
@@ -2500,7 +2508,11 @@ class Tpkg
           raise "Exit value #{$?.exitstatus}"
         end
       rescue => e
-        raise Tpkg.wrap_exception(e, "External #{name} #{operation} for #{File.basename(pkgfile)}: " + e.message)
+        if @force
+          warn "External #{name} #{operation} for #{File.basename(pkgfile)}: " + e.message
+        else
+          raise Tpkg.wrap_exception(e, "External #{name} #{operation} for #{File.basename(pkgfile)}: " + e.message)
+        end
       end
     else
       raise "Bug, unknown external operation #{operation}"
@@ -3063,7 +3075,7 @@ class Tpkg
       
       begin
         # Warn the user about non-executable files, as system will just
-        # silently fail and exit if that's the case.
+        # silently fail and return if that's the case.
         if !File.executable?(File.join(workdir, 'tpkg', 'preinstall'))
           warn "Warning: preinstall script for #{File.basename(package_file)} is not executable, execution will likely fail"
         end
@@ -3088,7 +3100,7 @@ class Tpkg
       
       begin
         # Warn the user about non-executable files, as system will just
-        # silently fail and exit if that's the case.
+        # silently fail and return if that's the case.
         if !File.executable?(File.join(workdir, 'tpkg', 'postinstall'))
           warn "Warning: postinstall script for #{File.basename(package_file)} is not executable, execution will likely fail"
         end
@@ -3125,7 +3137,15 @@ class Tpkg
           begin
             if external[:datafile]
               # Read the file
-              external[:data] = IO.read(external[:datafile])
+              begin
+                external[:data] = IO.read(external[:datafile])
+              rescue => e
+                if @force
+                  warn "Datafile #{external[:datafile]} for package #{File.basename(metadata[:filename])}: " + e.message
+                else
+                  raise Tpkg.wrap_exception(e, "Datafile #{external[:datafile]} for package #{File.basename(metadata[:filename])}: " + e.message)
+                end
+              end
               # Drop the datafile key so that we don't waste time re-reading the
               # datafile again in the future.
               external.delete(:datafile)
@@ -3137,14 +3157,22 @@ class Tpkg
               # warning specifies that it was a datascript and includes the
               # package name.
               if !File.executable?(external[:datascript])
-                warn "Warning: datascript for package #{File.basename(metadata[:filename])} is not executable, execution will likely fail"
+                warn "Datascript for package #{File.basename(metadata[:filename])} is not executable, execution will likely fail"
               end
               # Run the script
-              IO.popen(external[:datascript]) do |pipe|
-                external[:data] = pipe.read
-              end
-              if !$?.success?
-                raise "Datascript #{external[:datascript]} for package #{File.basename(metadata[:filename])} had exit value #{$?.exitstatus}"
+              begin
+                IO.popen(external[:datascript]) do |pipe|
+                  external[:data] = pipe.read
+                end
+                if !$?.success?
+                  raise "Exit value #{$?.exitstatus}"
+                end
+              rescue => e
+                if @force
+                  warn "Datascript #{external[:datascript]} for package #{File.basename(metadata[:filename])}: " + e.message
+                else
+                  raise Tpkg.wrap_exception(e, "Datascript #{external[:datascript]} for package #{File.basename(metadata[:filename])}: " + e.message)
+                end
               end
               # Drop the datascript key so that we don't waste time re-running the
               # datascript again in the future.
@@ -4062,7 +4090,7 @@ class Tpkg
         Dir.chdir(File.join(workdir, 'tpkg'))
         
         # Warn the user about non-executable files, as system will just
-        # silently fail and exit if that's the case.
+        # silently fail and return if that's the case.
         if !File.executable?(File.join(workdir, 'tpkg', 'preremove'))
           warn "Warning: preremove script for #{File.basename(package_file)} is not executable, execution will likely fail"
         end
@@ -4145,7 +4173,7 @@ class Tpkg
         Dir.chdir(File.join(workdir, 'tpkg'))
         
         # Warn the user about non-executable files, as system will just
-        # silently fail and exit if that's the case.
+        # silently fail and return if that's the case.
         if !File.executable?(File.join(workdir, 'tpkg', 'postremove'))
           warn "Warning: postremove script for #{File.basename(package_file)} is not executable, execution will likely fail"
         end
@@ -4357,6 +4385,11 @@ class Tpkg
     
     ordered_init_scripts.each do |init_script|
       installed_path = init_script[:path]
+      # Warn the user about non-executable files, as system will just
+      # silently fail and return if that's the case.
+      if !File.executable?(installed_path)
+        warn "Warning: init script for #{pkg[:metadata][:name]} is not executable, execution will likely fail"
+      end
       system("#{installed_path} #{action}")
       ret_val = INITSCRIPT_ERR if !$?.success?
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tpkg
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 2
   - 2
-  - 3
-  version: 2.2.3
+  - 4
+  version: 2.2.4
 platform: ruby
 authors: 
 - Darren Dao
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 -08:00
+date: 2011-04-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency