Merge remote-tracking branch 'origin' into portal3

[hcoop/portal.git] / apt.mlt

diff --git a/apt.mlt b/apt.mlt
index 1cbfde5..ab3e2e4 100644 (file)
--- a/apt.mlt
+++ b/apt.mlt
@@ -3,7 +3,7 @@
 val admin = Group.inGroupName "server";
 
 val nodeNum = case $"node" of
-                 "" => 2
+                 "" => 4
                | node => Web.stoi node;
 
 if $"new" <> "" then
@@ -188,10 +188,8 @@ elseif $"mod" <> "" then
        val oldStatus = #status req;
        val newStatus = Apt.statusFromInt (Web.stoi ($"status"));
        Apt.modify {req with node = node, data = $"pkgs", msg = $"msg", status = newStatus};
-       if oldStatus <> newStatus then
-               if not (Apt.notifyMod {old = oldStatus, new = newStatus, changer = Init.getUserName(), req = id}) then
-                       %><h3>Error sending e-mail notification</h3><%
-               end
+       if not (Apt.notifyMod {old = oldStatus, new = newStatus, changer = Init.getUserName(), req = id}) then
+               %><h3>Error sending e-mail notification</h3><%
        end
        %><h3>Request modified</h3>
        Back to: <a href="apt?cmd=open">open requests</a>, <a href="apt?cmd=list">all requests</a>
@@ -215,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">