lib/rim/rim_info.rb in esr-rim-1.2.2 vs lib/rim/rim_info.rb in esr-rim-1.3.0

- old
+ new

@@ -7,16 +7,15 @@ # Files are protected by a checksum an will become invalid if modified. # # Example: # # 4759302048574720930432049375757593827561 -# remote_url: ssh://some/url/to/git/repo -# revision: 8347982374198379842984562095637243593092 -# rev_name: mymod-1.2.3 -# upstream: trunk -# ignores: CMakeLists.txt,*.arxml -# checksum: 9584872389474857324485873627894494726222 +# remote_url: ssh://some/url/to/git/repo +# revision_sha1: 8347982374198379842984562095637243593092 +# target_revision: trunk +# ignores: CMakeLists.txt,*.arxml +# checksum: 9584872389474857324485873627894494726222 # # rev_name is a symbolic name for revision # # ignores is a comma separated list of file patterns to be ignored # @@ -27,11 +26,12 @@ AttrsDef = [ :remote_url, :revision_sha1, :target_revision, :ignores, - :checksum + :checksum, + :subdir ] AttrsDef.each do |d| attr_accessor d end @@ -71,9 +71,12 @@ name, value = l[0..col-1], l[col+1..-1] if name && value attrs[name.strip.to_sym] = value.strip end end + end + if attrs[:subdir] == "" + attrs[:subdir] = nil end end AttrsDef.each do |a| send("#{a}=".to_sym, attrs[a]) end