[SCM] patch-parser packaging branch, master, updated. 43474b21f016a6c6ceaa1bd528e34a0ab6b65fbb

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/patch-parser.git;a=commitdiff;h=ab4a801

The following commit has been merged in the master branch:
commit ab4a8011cddebb732317c8cd72000c3e39cdf4f4
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Apr 13 13:17:53 2015 +0200

    style fixes
---
 lib/dep3.rb | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/dep3.rb b/lib/dep3.rb
index e6e5bdf..fd44f15 100644
--- a/lib/dep3.rb
+++ b/lib/dep3.rb
@@ -30,7 +30,7 @@ class Dep3 < Hash
     @aliases = {
       'Description' => 'Subject',
       'Author' => 'From',
-      'Reviewed-by' => 'Acked-by',
+      'Reviewed-by' => 'Acked-by'
     }
   end
 
@@ -38,23 +38,21 @@ class Dep3 < Hash
     @aliases.each do |alias_key, alias_value|
       return alias_key if key == alias_value
     end
-    return key
+    key
   end
 
   def [](key)
     super(get_alias(key))
   end
 
-  def []=(key,value)
+  def []=(key, value)
     super(get_alias(key), value)
   end
 
-  def parse!()
+  def parse!
     state = NONE_STATE
     current_header = nil
 
-    data = {}
-
     File.readlines(@filepath).each do |line|
       begin
         break if line.strip == '---'
@@ -64,7 +62,7 @@ class Dep3 < Hash
       end
 
       header_match = line.match(/^(\S+):(.*)/)
-      if not header_match.nil?
+      unless header_match.nil?
         # 0 = full match
         # 1 = key match
         # 2 = value match
@@ -81,7 +79,7 @@ class Dep3 < Hash
       end
 
       fold_match = line.match(/^\s(.+)/)
-      if not fold_match.nil? and state == HEADER_STATE
+      if !fold_match.nil? && state == HEADER_STATE
         # Folding value encountered -> append to header.
         # 0 full match
         # 1 value match
@@ -90,7 +88,7 @@ class Dep3 < Hash
         next
       end
 
-      if line == '
' and state == FREEFORM_STATE
+      if line == '
' && state == FREEFORM_STATE
         state = NONE_STATE
         next
       end
@@ -124,15 +122,15 @@ class Dep3 < Hash
 
     # Check for required headers.
     return if self['Description'].nil?
-    return if self['Origin'].nil? and self['Author'].nil?
+    return if self['Origin'].nil? && self['Author'].nil?
 
     # Patch is legit dep3, append free form description lines to actual
     # description.
     self['Description'] << "
#{self['__freeDescription']}"
-    self.delete('__freeDescription')
+    delete('__freeDescription')
 
     # Bonus: strip useless characters from all values
-    self.each do |key, value|
+    each do |key, _value|
       self[key].strip!
     end
 

-- 
patch-parser packaging