rpm/supermin
SHA256
1
0
Fork 0
forked from pool/supermin
Code Pull Requests Activity

Add --no-gpg-checks

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/supermin?expand=0&rev=13
This commit is contained in:
Olaf Hering 2013-06-04 08:28:15 +00:00 committed by Git OBS Bridge
parent 35375a2d61
commit 8e695465c5
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
0001-Handle-packager-config-in-zypp_rpm.patch
View File

@ -1,12 +1,12 @@
From 4e383ba22421c2eaf797dcac09dfed30a8ccfa66 Mon Sep 17 00:00:00 2001 From e3ad17403b0e1ad4fc9a00d04304a155872d07e6 Mon Sep 17 00:00:00 2001
From: Olaf Hering <olaf@aepfle.de> From: Olaf Hering <olaf@aepfle.de>
Date: Mon, 3 Jun 2013 17:09:10 +0200 Date: Mon, 3 Jun 2013 17:09:10 +0200
Subject: Handle --packager-config in zypp_rpm Subject: Handle --packager-config in zypp_rpm
--- ---
src/Makefile.am | 2 +- src/Makefile.am | 2 +-
src/supermin_zypp_rpm.ml | 21 ++++++++++++++++++--- src/supermin_zypp_rpm.ml | 23 ++++++++++++++++++++---
2 files changed, 19 insertions(+), 4 deletions(-) 2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am
index 3b6ca9b..6ed0faf 100644 index 3b6ca9b..6ed0faf 100644
@ -22,7 +22,7 @@ index 3b6ca9b..6ed0faf 100644
supermin: $(OBJECTS) supermin: $(OBJECTS)
diff --git a/src/supermin_zypp_rpm.ml b/src/supermin_zypp_rpm.ml diff --git a/src/supermin_zypp_rpm.ml b/src/supermin_zypp_rpm.ml
index c269aab..b82984b 100644 index c269aab..c9786ce 100644
--- a/src/supermin_zypp_rpm.ml --- a/src/supermin_zypp_rpm.ml
+++ b/src/supermin_zypp_rpm.ml +++ b/src/supermin_zypp_rpm.ml
@@ -45,6 +45,7 @@ @@ -45,6 +45,7 @@
@ -53,7 +53,7 @@ index c269aab..b82984b 100644
let zypp_rpm_detect () = let zypp_rpm_detect () =
(file_exists "/etc/SuSE-release") && (file_exists "/etc/SuSE-release") &&
Config.zypper <> "no" && Config.rpm <> "no" Config.zypper <> "no" && Config.rpm <> "no"
@@ -75,7 +89,7 @@ pkg_cache_dir=%S @@ -75,10 +89,11 @@ pkg_cache_dir=%S
time zypper \ time zypper \
%s \ %s \
%s \ %s \
@ -62,7 +62,11 @@ index c269aab..b82984b 100644
--cache-dir \"${cache_dir}\" \ --cache-dir \"${cache_dir}\" \
--pkg-cache-dir \"${pkg_cache_dir}\" \ --pkg-cache-dir \"${pkg_cache_dir}\" \
--gpg-auto-import-keys \ --gpg-auto-import-keys \
@@ -92,6 +106,7 @@ time zypper \ + --no-gpg-checks \
--non-interactive \
install \
--auto-agree-with-licenses \
@@ -92,6 +107,7 @@ time zypper \
(match packager_config with None -> "" (match packager_config with None -> ""
| Some filename -> sprintf "--config %s" filename) | Some filename -> sprintf "--config %s" filename)
tmp_root tmp_root
@ -70,7 +74,7 @@ index c269aab..b82984b 100644
in in
run_shell sh names; run_shell sh names;
@@ -129,7 +144,7 @@ unset LANG ${!LC_*} @@ -129,9 +145,10 @@ unset LANG ${!LC_*}
zypper \ zypper \
%s \ %s \
%s \ %s \
@ -78,8 +82,11 @@ index c269aab..b82984b 100644
+ --root %S --reposd-dir %S \ + --root %S --reposd-dir %S \
--cache-dir %S \ --cache-dir %S \
--gpg-auto-import-keys \ --gpg-auto-import-keys \
+ --no-gpg-checks \
--non-interactive \ --non-interactive \
@@ -146,7 +161,7 @@ zypper \ --xml \
install \
@@ -146,7 +163,7 @@ zypper \
(if verbose then "--verbose --verbose" else "--quiet") (if verbose then "--verbose --verbose" else "--quiet")
(match packager_config with None -> "" (match packager_config with None -> ""
| Some filename -> sprintf "--config %s" filename) | Some filename -> sprintf "--config %s" filename)