Djam/livecd-tools
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/livecd-tools.git synced 2025-02-24 08:02:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try installing RPMs from cache directly, without perl-URPM

Browse source
This commit is contained in:
Mikhail Novosyolov 2019-03-09 14:18:07 +03:00
parent a662819225
commit 29195674e0
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
livecd-tools.spec
View file

@ -3,7 +3,7 @@
Summary: Tools for building live CDs Summary: Tools for building live CDs
Name: livecd-tools Name: livecd-tools
Version: 21.1 Version: 21.1
Release: 47 Release: 48
Epoch: 1 Epoch: 1
License: GPLv2+ License: GPLv2+
Group: System/Base Group: System/Base

10
urpmi-bootstrapper.sh
View file

@ -93,7 +93,15 @@ do
if [ "$urpmi_return_code" != 0 ]; then failed_pkgs="${failed_pkgs} ${i}"; fi if [ "$urpmi_return_code" != 0 ]; then failed_pkgs="${failed_pkgs} ${i}"; fi
set -e set -e
done done
if [ -n "${failed_pkgs}" ]; then echo "Failed packages: ${failed_pkgs}"; fi
if [ -n "${failed_pkgs}" ]; then
echo "Failed packages: ${failed_pkgs}"
# If there were failed packages, let's install all RPMs in cache.
# It will be done without potentially buggy perl-URPM.
( set +f
urpmi_cache="${urpmiRoot}/var/cache/urpmi/rpms"
rpm -Uvh ${urpmi_cache}/*.rpm || : )
fi
# Now, regardless success of installing one-by-one, let's install all packages and see if it will be successfull # Now, regardless success of installing one-by-one, let's install all packages and see if it will be successfull
# and exit with error, if it failed # and exit with error, if it failed