many changes:

[helm.git] / helm / software / components / metadata / metadataDeps.ml

diff --git a/helm/software/components/metadata/metadataDeps.ml b/helm/software/components/metadata/metadataDeps.ml
index 7454663400a32db88db5e1113a5764b25eedde10..bf1dc49e0ec2d8213577f31a275aa27e4e2ad1f2 100644 (file)
--- a/helm/software/components/metadata/metadataDeps.ml
+++ b/helm/software/components/metadata/metadataDeps.ml
@@ -103,12 +103,13 @@ let topological_sort ~dbd uris =
 
 let sorted_uris_of_baseuri ~dbd baseuri =
    let sql_pat = 
-      Pcre.replace ~rex:(Pcre.regexp "_") ~templ:"\\_" baseuri ^ "%" 
+     Pcre.replace ~pat:"([^\\\\])_" ~templ:"$1\\_" baseuri ^ "%"
    in
    let query =
       Printf.sprintf
-         ("SELECT source FROM %s WHERE source LIKE \"%s\" UNION "^^
-          "SELECT source FROM %s WHERE source LIKE \"%s\"")
+         ("SELECT source FROM %s WHERE source LIKE \"%s\" ESCAPE \"\\\" UNION "
+           ^^
+          "SELECT source FROM %s WHERE source LIKE \"%s\" ESCAPE \"\\\"")
          (MetadataTypes.name_tbl ()) sql_pat
          MetadataTypes.library_name_tbl sql_pat
    in