[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

John Goerzen jgoerzen at complete.org
Fri Apr 23 14:44:59 UTC 2010


The following commit has been merged in the master branch:
commit 34cb303cb4d9199b637707faad154fb0b154fe71
Author: John Goerzen <jgoerzen at complete.org>
Date:   Thu Oct 21 03:24:05 2004 +0100

    Added mime types parsing
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--1.0--patch-87)

diff --git a/ChangeLog b/ChangeLog
index cacf50e..1f50904 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--1.0
 #
 
+2004-10-20 21:24:05 GMT	John Goerzen <jgoerzen at complete.org>	patch-87
+
+    Summary:
+      Added mime types parsing
+    Revision:
+      missingh--head--1.0--patch-87
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/MIMETypes.hs
+
+
 2004-10-20 21:22:52 GMT	John Goerzen <jgoerzen at complete.org>	patch-86
 
     Summary:
diff --git a/libsrc/MissingH/MIMETypes.hs b/libsrc/MissingH/MIMETypes.hs
index 7335bdd..c7f2ab7 100644
--- a/libsrc/MissingH/MIMETypes.hs
+++ b/libsrc/MissingH/MIMETypes.hs
@@ -137,10 +137,13 @@ makeMIMETypes mtd =
                         procwords (('#':_) :_) = []
                         procwords (x:xs) = x : procwords xs
                         l2 = procwords l1
-                        thetype = head l2
-                        suffixlist = tail l2
                         in
-                        foldl (\o suff -> (addType o) strict thetype suff) obj suffixlist
+                        if (length l2) >= 2 then
+                           let thetype = head l2
+                               suffixlist = tail l2
+                               in
+                               foldl (\o suff -> (addType o) strict thetype suff) obj suffixlist
+                        else self
                 in
                 do
                 lines <- hGetLines h

-- 
haskell-testpack



More information about the Pkg-haskell-commits mailing list