tor-browser

commit 232c50172e1809791a00662dce837fc2b9633a35
parent 9c5211a4ab70ab8a7f2863422e5eb35be9c9a955
Author: Bastien Orivel <borivel@mozilla.com>
Date:   Mon,  1 Dec 2025 10:54:51 +0000

Bug 2003242 - Use the build ID as build number for nightly RPMs. r=releng-reviewers,jcristau

Without this, we would try to upload 2 consecutive nightlies to GAR
with the exact same version (`147.0a1-1`) which makes it very unhappy.
Using the build id as build number for nightlies matches what we do for
deb packages and will prevent duped versions in the registry

Differential Revision: https://phabricator.services.mozilla.com/D274569

Diffstat:
M
python/mozbuild/mozbuild/repackaging/rpm.py
 | 
9
++++++++-

1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/python/mozbuild/mozbuild/repackaging/rpm.py b/python/mozbuild/mozbuild/repackaging/rpm.py
@@ -11,6 +11,7 @@ import tempfile
 
 import mozfile
 import mozpack.path as mozpath
+from mozilla_version.gecko import GeckoVersion
 
 from mozbuild.repackaging.utils import (
     application_ini_data_from_tar,
@@ -68,12 +69,18 @@ def repackage_rpm(
         mozfile.extract_tarball(infile, source_dir)
 
         application_ini_data = application_ini_data_from_tar(infile)
+        gecko_version = GeckoVersion.parse(version)
+        rpm_build_number = (
+            application_ini_data["build_id"]
+            if gecko_version.is_nightly
+            else str(build_number)
+        )
         build_variables = get_build_variables(
             application_ini_data,
             arch,
             version,
             product=product,
-            build_number=build_number,
+            build_number=rpm_build_number,
         )
 
         rpm_dir = mozpath.join(source_dir, "rpm")