STRICT_UPGRADES changes

pghvlaans · Jan 3, 2025 · f305919 · f305919
1 parent 103b2c2
commit f305919
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/ChangeLog/index.md b/ChangeLog/index.md
@@ -1,6 +1,9 @@
 # ChangeLog
 * Post-Release
   * *sboconfig*: Run without flags or options to use an interactive menu
+  * *sboupgrade*: Do not attempt to upgrade the build queue if the requested script does not need an upgrade
+  * *sbocheck*: Display the installed build number for the build number check
+  * Add setting **STRICT_UPGRADES**: Except for build number upgrades and override packages, only upgrade when the version is higher
 
 * 3.3 - 2024-12-31
   * *sboconfig*: Allow versions "X.Y+" and "current"; more informative error messages

diff --git a/development/index.md b/development/index.md
@@ -14,10 +14,10 @@ These features may be added in the future:
 
 * Rebuild a reverse dependency queue
 * New tool for working with `sbotools.hints`
-* Optionally, only upgrade on version increment (not difference)
 
 Nothing on the above list is guaranteed to appear in `sbotools`.
 
 ## Arriving in Version 3.4
 
 * Interactive mode for `sboconfig` (use without flags or options to access)
+* Optionally, only upgrade on version and build increment (not difference)
diff --git a/man/post-release/sboconfig.1.md b/man/post-release/sboconfig.1.md
@@ -28,7 +28,7 @@
               [-g TRUE|FALSE ] [-j #|FALSE] [-p /path|FALSE] \
               [-s /path|/usr/sbo] [-B branch_name|FALSE] [-b TRUE|FALSE] \
               [-o /path|FALSE] [-V #.#|FALSE] [-r url|FALSE] \
-              [-R TRUE|FALSE]
+              [-R TRUE|FALSE] [-S TRUE|FALSE]
 
 ## DESCRIPTION
 
@@ -154,6 +154,12 @@ directories are under the category directories.
 **RSYNC_DEFAULT**: If set to **TRUE**, use rsync default mirrors except
 for Slackware -current.
 
+**-S\|\--strict-upgrades (FALSE\|TRUE)**
+
+**STRICT_UPGRADES**: If set to **TRUE**, upgrades will only be attempted
+if the incoming version or build number is greater. This has no effect
+on scripts in the local overrides directory.
+
 ## EXIT CODES
 
 **sboconfig** can exit with the following codes:

diff --git a/man/post-release/sbotools.conf.5.md b/man/post-release/sbotools.conf.5.md
@@ -114,6 +114,12 @@ directories are under the category directories.
 If set to **TRUE**, use rsync default mirrors except for Slackware
 -current.
 
+**STRICT_UPGRADES=(FALSE\|TRUE)**
+
+If set to **TRUE**, upgrades will only be attempted if the incoming
+version or build number is greater. This has no effect on scripts in the
+local overrides directory.
+
 ## SEE ALSO
 
 [sbocheck(1)](sbocheck.1.md), [sboclean(1)](sboclean.1.md), [sboconfig(1)](sboconfig.1.md), [sbofind(1)](sbofind.1.md), [sboinstall(1)](sboinstall.1.md),

diff --git a/man/post-release/sboupgrade.1.md b/man/post-release/sboupgrade.1.md
@@ -21,7 +21,8 @@
     sboupgrade [-h|-v]
 
     sboupgrade [-c TRUE|FALSE] [-d TRUE|FALSE] [-j #|FALSE] \
-               [-b TRUE|FALSE] [-fiprz] --all|sbo_name (sbo_name)
+               [-b TRUE|FALSE] [-S TRUE|FALSE] [-fiprz] \
+\--all\|sbo_name (sbo_name)
 
 ## DESCRIPTION
 
@@ -128,6 +129,12 @@ SlackBuilds. Unless it is obvious that dependency resolution and build
 options are not required, this option should not be used with
 **sboupgrade**.
 
+**-S\|\--strict-upgrades**
+
+If **TRUE**, only perform upgrades if the incoming version or build
+number is higher. This has no effect scripts in the local overrides
+directory. See [sboconfig(1)](sboconfig.1.md) or [sbotools.conf(5)](sbotools.conf.5.md).
+
 **-z\|\--force-reqs**
 
 In the same vein as **\--force**, upgrade the SlackBuild and its