The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc-ci/pull/186
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
From cc352e3cf065b36c78b71b56cb95f7eed2202355 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Mon, 3 Aug 2020 13:33:20 +0200
Subject: [PATCH] images/gentoo: Fix post-packages action
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
images/gentoo.yaml | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/images/gentoo.yaml b/images/gentoo.yaml
index 1eceadc..76cef86 100644
--- a/images/gentoo.yaml
+++ b/images/gentoo.yaml
@@ -484,10 +484,15 @@ actions:
#!/bin/sh
set -eux
- rm /usr/bin/gpg2
- mv /usr/bin/gpg2.real /usr/bin/gpg2
- rm /usr/share/portage/config/repos.conf
- mv /usr/share/portage/config/repos.conf.orig
/usr/share/portage/config/repos.conf
+ if [ -f /usr/bin/gpg2.real ]; then
+ rm /usr/bin/gpg2
+ mv /usr/bin/gpg2.real /usr/bin/gpg2
+ fi
+
+ if [ -f /usr/share/portage/config/repos.conf.orig ]; then
+ rm /usr/share/portage/config/repos.conf
+ mv /usr/share/portage/config/repos.conf.orig
/usr/share/portage/config/repos.conf
+ fi
types:
- container
- vm
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
