af22ed5454
- Remove unneeded createrepo build dependency (bsc#1082689)
- builder-repository: fix SLES short id computation
Patch added:
0a55098f-builder-repository-fix-compute_short_id-for-sles-X.0.patch
- Fix handling of Latin-1 encoding in rpmdb (bsc#1075803)
Patches added:
0001-Introduce-a-wrapper-around-xmlParseURI.patch
0002-common-extract-UTF-8-conversion-function.patch
0003-inspector-rpm-summary-and-description-may-not-be-utf.patch
OBS-URL: https://build.opensuse.org/request/show/580945
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=427
29 lines
913 B
Diff
29 lines
913 B
Diff
From 0a55098f661457b3a4e17b8f5cdd7540d53aec32 Mon Sep 17 00:00:00 2001
|
|
From: Pino Toscano <ptoscano@redhat.com>
|
|
Date: Thu, 22 Feb 2018 18:39:37 +0100
|
|
Subject: [PATCH] builder-repository: fix compute_short_id for sles X.0
|
|
|
|
It needs to check for the minor version, not major version.
|
|
|
|
Fixes commit a442d2c3217f709128f0e377f88649fb6ba90f45.
|
|
---
|
|
builder/repository_main.ml | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/builder/repository_main.ml b/builder/repository_main.ml
|
|
index bb440563b..9932fbae4 100644
|
|
--- a/builder/repository_main.ml
|
|
+++ b/builder/repository_main.ml
|
|
@@ -178,7 +178,7 @@ let compute_short_id distro major minor =
|
|
sprintf "%s%d" distro major
|
|
| ("fedora"|"mageia") ->
|
|
sprintf "%s%d" distro major
|
|
- | "sles" when major = 0 ->
|
|
+ | "sles" when minor = 0 ->
|
|
sprintf "%s%d" distro major
|
|
| "sles" ->
|
|
sprintf "%s%dsp%d" distro major minor
|
|
--
|
|
2.16.1
|
|
|