[DRE-commits] [SCM] ruby-ole.git branch, master, updated. debian/1.2.11.1-5-7-gf69f0fe

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit feaf06a3d42ce505fb8c317c97b3e3ba8b41b459
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Mon Jan 16 00:30:53 2012 -0600

    Keep the file as before patching takes place

diff --git a/lib/ole/types/property_set.rb b/lib/ole/types/property_set.rb
index e619388..ce8662d 100644
--- a/lib/ole/types/property_set.rb
+++ b/lib/ole/types/property_set.rb
@@ -24,13 +24,7 @@ module Ole
 			}
 
 			# define a smattering of the property set guids. 
-                        propids = [ '/usr/share/ruby-ole/propids.yaml',
-                                    File.dirname(__FILE__) + '/../../../../../share/ruby-ole/data/propids.yaml',
-                                    File.dirname(__FILE__) + '/../../../data/propids.yaml'
-                                  ].select { |filepath|
-                                 File.exists?(filepath) }.first
-                        raise Exception, 'propids.yaml file could not be found' if propids.nil?
-                        DATA = YAML.load_file(propids).
+			DATA = YAML.load_file(File.dirname(__FILE__) + '/../../../data/propids.yaml').
 				inject({}) { |hash, (key, value)| hash.update Clsid.parse(key) => value }
 
 			# create an inverted map of names to guid/key pairs

-- 
ruby-ole.git