[SCM] ci-tooling packaging branch, master, updated. e89eff2981466eefbf2a4ad239698253ff81f220

Harald Sitter apachelogger-guest at moszumanska.debian.org
Sun Jan 11 17:01:19 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=106fb23

The following commit has been merged in the master branch:
commit 106fb23217c8f7d21dd6b49772085b1d80dcb59d
Author: Harald Sitter <sitter at kde.org>
Date:   Sun Jan 11 18:00:41 2015 +0100

    clean out whitespaces in debian/control.rb
---
 lib/debian/control.rb | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/debian/control.rb b/lib/debian/control.rb
index d2b5043..16d0c68 100644
--- a/lib/debian/control.rb
+++ b/lib/debian/control.rb
@@ -12,7 +12,7 @@ class Relationship
     attr_reader :name
     attr_reader :operator
     attr_reader :version
-    
+
     def initialize(string)
         @name = nil
         @operator = nil
@@ -20,7 +20,7 @@ class Relationship
 
         string.strip!
         return if string.empty?
-        
+
         # Fancy plain text description:
         # - Start of line
         # - any word character, at least once
@@ -47,12 +47,12 @@ end
 class DebianControl
     attr_reader :source
     attr_reader :binaries
-    
+
     def initialize
         @source = nil
         @binaries = nil
     end
-    
+
     def parse_relationships(line)
         ret = []
         line.split(',').each do | string |
@@ -62,7 +62,7 @@ class DebianControl
         end
         return ret
     end
-    
+
     def parse_paragraph(lines, fields = {})
         mandatory_fields = fields[:mandatory] || []
         multiline_fields = fields[:multiline] || []
@@ -91,14 +91,14 @@ class DebianControl
                 data[key] = value
                 next
             end
-            
+
             fold_match = line.match(/^\s+(.+)/)
             unless fold_match.nil?
                 # Folding value encountered -> append to header.
                 # 0 full match
                 # 1 value match
                 value = fold_match[1].lstrip
-                
+
                 # Fold matches can either be proper RFC 5322 folds or
                 # multiline continuations, latter wants to preserve
                 # newlines and so forth.
@@ -122,32 +122,32 @@ class DebianControl
             end
 
             # TODO: user defined fields
-            
+
             raise "Paragraph parsing ran into an unknown line: '#{line}'"
         end
-       
+
         # If the entire stanza was commented out we can end up with no data, it is very sad.
         return nil if data.empty?
 
         mandatory_fields.each do |field|
             # TODO: this should really make a list and complain all at once or something.
-            raise "Missing mandatory field #{field}" unless data.include?(field) 
+            raise "Missing mandatory field #{field}" unless data.include?(field)
         end
 
         return data
     end
-    
+
     def parse!
         puts "#{Dir.pwd}/debian/control"
         lines = File.new('debian/control').readlines
-        
+
         # Source Paragraph
         fields = {}
         fields[:mandatory] = [
             'source',
             'maintainer'
         ]
-        fields[:relationship] = [    
+        fields[:relationship] = [
             'build-depends',
             'build-depends-indep',
             'build-conflicts',
@@ -155,7 +155,7 @@ class DebianControl
         ]
         fields[:foldable] = ['uploaders'] + fields[:relationship]
         @source = parse_paragraph(lines, fields)
-        
+
         # Binary Paragraphs
         fields = {}
         fields[:mandatory] = [
@@ -163,7 +163,7 @@ class DebianControl
             'architecture',
             'description'
         ]
-        fields[:multiline] = ['description']               
+        fields[:multiline] = ['description']
         fields[:relationship] = [
             'depends',
             'recommends',

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list