Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master quill by Ismael Luceno (8a4f61425c5216f2beac2ac5860e79d10404c4e0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master quill by Ismael Luceno (8a4f61425c5216f2beac2ac5860e79d10404c4e0)
  • Date: Thu, 25 Jun 2015 18:36:38 +0000

GIT changes to master quill by Ismael Luceno <ismael AT sourcemage.org>:

var/lib/quill/modules/site_handlers/libhackagedb | 55
+++++++++++++++++------
1 file changed, 43 insertions(+), 12 deletions(-)

New commits:
commit 8a4f61425c5216f2beac2ac5860e79d10404c4e0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libhackagedb: Ignore more packages included in GHC

commit 78834ee3872359b3ee364dc8cd77ffb25ea25de4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libhackagedb: Fix parsing of description field

Trims white-space at the beginning of lines, fixes detection of the field
ending, and corrects handling of empty lines.

commit 9de171bde19fdfe15c26919fb3c98a37c0e6e83b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libhackagedb: Fix handling of build-depends field

commit a184ccdffcc76d07da5071472f039c20e2f54254
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libhackagedb: Handle cabal fields case-insensitively

diff --git a/var/lib/quill/modules/site_handlers/libhackagedb
b/var/lib/quill/modules/site_handlers/libhackagedb
index 417b9f4..97e5cf7 100644
--- a/var/lib/quill/modules/site_handlers/libhackagedb
+++ b/var/lib/quill/modules/site_handlers/libhackagedb
@@ -60,8 +60,8 @@ function quill_hdb_get_info(){
case "$info" in
src)
awk '
- /^name:/ { n = $2 }
- /^version:/ { n = n "-" $2; exit }
+ /^[Nn][Aa][Mm][Ee]:/ { n = $2 }
+ /^[Vv][Ee][Rr][Ss][Ii][Oo][Nn]:/ { n = n "-" $2; exit }
END {
printf "http://hackage.haskell.org/package/%s/%s.tar.gz\n";, n, n
}
@@ -69,10 +69,19 @@ function quill_hdb_get_info(){
;;
description)
awk '
- !/^description:/ { next }
+ !/^[Dd][Ee][Ss][Cc][Rr][Ii][Pp][Tt][Ii][Oo][Nn]:/ { next }
{
- sub(/[^:]*: */, "")
- do if ($0) print; while (getline && !/^[-a-z]+:/)
+ sub(/^[^:]*:/, "")
+ do {
+ if ($0) {
+ if (NF == 1 && $1 == ".") {
+ print ""
+ } else {
+ gsub("^[\t ]*", "")
+ print
+ }
+ }
+ } while (getline && !/^[-A-Za-z]+:/ && $0)
exit
}
'
@@ -80,20 +89,42 @@ function quill_hdb_get_info(){
build-depends)
awk '
BEGIN {
+ # Packages included in GHC
+ discard["*"]
+ discard["Cabal"]
+ discard["Win32"]
+ discard["array"]
discard["base"]
- discard["unix"]
+ discard["binary"]
discard["bytestring"]
+ discard["containers"]
+ discard["deepseq"]
+ discard["directory"]
+ discard["filepath"]
+ discard["ghc-prim"]
+ discard["haskeline"]
+ discard["hoopl"]
+ discard["hpc"]
+ discard["integer-gmp"]
+ discard["pretty"]
+ discard["process"]
+ discard["template-haskell"]
+ discard["terminfo"]
+ discard["time"]
+ discard["transformers"]
+ discard["unix"]
+ discard["xhtml"]
}
- /^name:/ { discard[$2] }
- $1 !~ /build-depends:/ { next }
+ /^[Nn][Aa][Mm][Ee]:/ { discard[$2] }
+ tolower($1) !~ /build-depends:/ { next }
{
$1 = ""
do {
- gsub(/,|&&|[><=]+ *[0-9.]+/, "")
+ gsub(/,|&&|[><=]+ *[0-9.]+/, " ")
for (i = 1; i <= NF; i++)
- if (!($i in discard))
+ if ($i && !($i in discard))
dep[$i]
- } while (getline && $1 && $1 !~ /[-a-z]+:/)
+ } while (getline && $1 !~ /^[-A-Za-z]+:$/ && $1)
}
END {
for (i in dep)
@@ -102,7 +133,7 @@ function quill_hdb_get_info(){
'
;;
*)
- sed -e "/$info:/!d;s/[^:]*: *//"
+ awk -vr="^$info:" 'tolower($0) ~ r { sub(/[^:]*:[\t ]*/, ""); print;
exit }'
;;
esac < "$file"
}



  • [SM-Commit] GIT changes to master quill by Ismael Luceno (8a4f61425c5216f2beac2ac5860e79d10404c4e0), Ismael Luceno, 06/25/2015

Archive powered by MHonArc 2.6.24.

Top of Page