From 1f884a3287a9f0c35ebfdf62598f1be01a258242 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Mar 03 2021 14:17:20 +0000
Subject: alter priority policy result syntax, catch ValueError


---

diff --git a/docs/source/defining_hub_policies.rst b/docs/source/defining_hub_policies.rst
index 784a4c0..054cde5 100644
--- a/docs/source/defining_hub_policies.rst
+++ b/docs/source/defining_hub_policies.rst
@@ -178,10 +178,10 @@ different:
 ``set <int>``
     * set priority to this value
 
-``increment by <int>``
+``adjust +<int>``
     * increment default priority
 
-``decrement by <int>``
+``adjust -<int>``
     * decrement default priority
 
 Available tests
diff --git a/hub/kojihub.py b/hub/kojihub.py
index c9a3778..0cc5d1a 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -606,14 +606,13 @@ def make_task(method, arglist, **opts):
             elif parts[0] == 'set':
                 # fixed value
                 opts['priority'] = int(parts[1])
-            elif parts[0] == 'increment' and parts[1] == 'by':
-                opts['priority'] += int(parts[2])
-            elif parts[0] == 'decrement' and parts[1] == 'by':
-                opts['priority'] -= int(parts[2])
+            elif parts[0] == 'adjust':
+                # note: int() will accept our preferred "+1" representation for increments
+                opts['priority'] += int(parts[1])
             else:
                 logger.error("Invalid result from priority policy: %s", ruleset.last_rule())
                 raise koji.GenericError("invalid priority policy")
-        except IndexError:
+        except (IndexError, ValueError):
             logger.error("Invalid result from priority policy: %s", ruleset.last_rule())
             raise koji.GenericError("invalid priority policy")