7e631b69bd
This code caused transient build failures when there is more than one package that provides /etc/system-release _available_ in any of the repositories, irrespective of _any_ dependecies whatsoever. The failure is non-deterministic, because depends on the order of packages returned by search query. Automatic branding install is stupid anyway and should instead be done by package groups, kickstarts and/or whatever. But it does not surprise me at all, because this is package is maintained as part of Fedora/RH. fixes QubesOS/qubes-issues#2076
61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
From 56a5816b152477b5fd057ed53c55863d59900f41 Mon Sep 17 00:00:00 2001
|
|
From: Wojtek Porczyk <woju@invisiblethingslab.com>
|
|
Date: Thu, 16 Jun 2016 18:53:18 +0200
|
|
Subject: [PATCH] Remove branding code
|
|
|
|
This code caused transient build failures when there is more than one
|
|
package that provides /etc/system-release _available_ in any of the
|
|
repositories, irrespective of _any_ dependecies whatsoever. The failure
|
|
is non-deterministic, because depends on the order of packages returned
|
|
by search query.
|
|
|
|
Automatic branding install is stupid anyway and should instead be done
|
|
by package groups, kickstarts and/or whatever. But it does not surprise
|
|
me at all, because this is package is maintained as part of Fedora/RH.
|
|
|
|
Signed-off-by: Wojtek Porczyk <woju@invisiblethingslab.com>
|
|
---
|
|
src/pylorax/treebuilder.py | 24 ------------------------
|
|
1 file changed, 24 deletions(-)
|
|
|
|
diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py
|
|
index 5d4f8b7..1bf9f22 100644
|
|
--- a/src/pylorax/treebuilder.py
|
|
+++ b/src/pylorax/treebuilder.py
|
|
@@ -88,32 +88,8 @@ class RuntimeBuilder(object):
|
|
self._runner.defaults = self.vars
|
|
self.dbo.reset()
|
|
|
|
- def _install_branding(self):
|
|
- release = None
|
|
- q = self.dbo.sack.query()
|
|
- a = q.available()
|
|
- for pkg in a.filter(provides='/etc/system-release'):
|
|
- if pkg.name.startswith('generic'):
|
|
- continue
|
|
- else:
|
|
- release = pkg.name
|
|
- break
|
|
-
|
|
- if not release:
|
|
- logger.error('could not get the release')
|
|
- return
|
|
-
|
|
- # release
|
|
- logger.info('got release: %s', release)
|
|
- self._runner.installpkg(release)
|
|
-
|
|
- # logos
|
|
- release, _suffix = release.split('-', 1)
|
|
- self._runner.installpkg('%s-logos' % release)
|
|
-
|
|
def install(self):
|
|
'''Install packages and do initial setup with runtime-install.tmpl'''
|
|
- self._install_branding()
|
|
if len(self._installpkgs) > 0:
|
|
self._runner.installpkg(*self._installpkgs)
|
|
self._runner.run("runtime-install.tmpl")
|
|
--
|
|
2.5.5
|
|
|