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