Update `domtool-admin package-exists $node $pkg` for apt requests

diff --git a/apt.mlt b/apt.mlt
index b5c808b..ab3e2e4 100644 (file)
--- a/apt.mlt
+++ b/apt.mlt
@@ -213,7 +213,10 @@ elseif $"mod" <> "" then
 
 <h3>Request new installations</h3>
 
-List the package names you'd like, separated by any whitespace characters.
+List the package names you'd like, separated by any whitespace
+characters. If you want the version of a package from <a
+href="http://backports-master.debian.org/">backports</a>, specify that
+in the "Reason" field.
 
 <form action="apt" method="post">
 <table class="blanks">

diff --git a/aptquery.sml b/aptquery.sml
index 6818938..d7fc8cc 100644 (file)
--- a/aptquery.sml
+++ b/aptquery.sml
@@ -14,7 +14,7 @@ fun query {node, pkg = name} =
            else
                raise Fail "Invalid package name"
 
-       val proc = Unix.execute ("/usr/bin/apt-cache", ["show", name])
+       val proc = Unix.executeInEnv ("/usr/local/bin/domtool-admin", ["package-exists", Init.nodeName node, name], ["DOMTOOL_USER=hcoop"])
        val inf = Unix.textInstreamOf proc
 
        fun loop (section, descr) =