[elbe-devel] [PATCH] elbepack: version: replace elbe_version_base with elbe_version_debian

[Thomas Weißschuh]

The elbe_version_base may not necessarily be the same as the Debian
package version. Introduce a dedicated variable for that.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh at linutronix.de>
---
 elbepack/init/preseed.cfg.mako | 4 ++--
 elbepack/version.py            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/elbepack/init/preseed.cfg.mako b/elbepack/init/preseed.cfg.mako
index 23957a3ac529..a8ed577ff7ed 100644
--- a/elbepack/init/preseed.cfg.mako
+++ b/elbepack/init/preseed.cfg.mako
@@ -3,7 +3,7 @@
 ## SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
 
 <%
-  from elbepack.version import elbe_version_base, elbe_initvm_packagelist
+  from elbepack.version import elbe_version_debian, elbe_initvm_packagelist
   from elbepack.filesystem import size_to_int
   swap = size_to_int(prj.text('swap-size', default=defs, key='swap-size')) // 1024 // 1024
 %>
@@ -136,7 +136,7 @@ d-i finish-install/reboot_in_progress note
 d-i pkgsel/include string rng-tools-debian \
                           dbus \
 % for p in elbe_initvm_packagelist:
-                          ${p}=${elbe_version_base}* \
+                          ${p}=${elbe_version_debian}* \
 % endfor
 % for n in pkgs:
 % if n.tag == "pkg":
diff --git a/elbepack/version.py b/elbepack/version.py
index b3eff7652633..1536d449a936 100644
--- a/elbepack/version.py
+++ b/elbepack/version.py
@@ -7,8 +7,8 @@ import sys
 
 
 is_devel = not pathlib.Path(__file__).is_relative_to(sys.prefix)
-elbe_version_base = '15.0'
-elbe_version = elbe_version_base
+elbe_version = '15.0'
+elbe_version_debian = elbe_version
 if is_devel:
     elbe_version += '.dev0'
 

---
base-commit: e76e277075587db699c94b8ba73647abd89fbe95
change-id: 20240829-debian-version-648c884c968d

Best regards,
-- 
Thomas Weißschuh <thomas.weissschuh at linutronix.de>