Parcourir la source

u-a: Switch back to a fatal error on out of range priority on --install

This reverts 18d9373b27effd533d386fdf7bfde6e6b3782101.
Guillem Jover il y a 14 ans
Parent
commit
8615497da9
2 fichiers modifiés avec 4 ajouts et 8 suppressions
  1. 2 1
      debian/changelog
  2. 2 7
      utils/update-alternatives.c

+ 2 - 1
debian/changelog

@@ -1,6 +1,7 @@
 dpkg (1.17.0) UNRELEASED; urgency=low
 
-  *
+  * Switch update-alternatives back to a fatal error on out of range priority
+    on --install.
 
  -- Guillem Jover <guillem@debian.org>  Fri, 03 Aug 2012 13:21:00 +0200
 

+ 2 - 7
utils/update-alternatives.c

@@ -2483,13 +2483,8 @@ main(int argc, char **argv)
 			prio = strtol(prio_str, &prio_end, 10);
 			if (prio_str == prio_end || *prio_end != '\0')
 				badusage(_("priority must be an integer"));
-			if (prio < INT_MIN || prio > INT_MAX || errno == ERANGE) {
-				/* XXX: Switch back to error on 1.17.x. */
-				prio = clamp(prio, INT_MIN, INT_MAX);
-				warning(_("priority is out of range: "
-				          "%s clamped to %ld"),
-				        prio_str, prio);
-			}
+			if (prio < INT_MIN || prio > INT_MAX || errno == ERANGE)
+				badusage(_("priority is out of range"));
 
 			a = alternative_new(argv[i + 2]);
 			inst_alt = alternative_new(argv[i + 2]);