aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornkessel <hd_brummy@gentoo.org>2014-10-01 10:09:24 +0200
committerJoerg Bornkessel <hd_brummy@gentoo.org>2014-10-01 10:09:24 +0200
commit41a02bec1c139246070afb173e9e9bdcac36a2eb (patch)
tree56f1b99178dcc0c157df90b24dc7de9247f1e7eb
parentBumped to version 2.5_rc1 (diff)
downloadgentoo-vdr-scripts-41a02bec1c139246070afb173e9e9bdcac36a2eb.tar.gz
gentoo-vdr-scripts-41a02bec1c139246070afb173e9e9bdcac36a2eb.tar.bz2
gentoo-vdr-scripts-41a02bec1c139246070afb173e9e9bdcac36a2eb.zip
added --keep-going to vdrplugin-rebuild; added empty file plugins_skipped_ALL to fix the fail on vdrplugin-rebuild -s parameter; bump to vdrplugin-rebuild-0.5
-rw-r--r--ChangeLog6
-rw-r--r--var/vdr/tmp/Makefile2
-rw-r--r--var/vdr/tmp/plugins_skipped_ALL0
-rw-r--r--vdrplugin-rebuild/vdrplugin-rebuild4
4 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4acef18..c30bedf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for gentoo-vdr-scripts
# $Id$
+ 01 Oct 2014; Joerg Bornkessel <hd_brummy@gentoo.org> var/vdr/tmp/Makefile,
+ +var/vdr/tmp/plugins_skipped_ALL, vdrplugin-rebuild/vdrplugin-rebuild:
+ added --keep-going to vdrplugin-rebuild; added empty file plugins_skipped_ALL
+ to fix the fail on vdrplugin-rebuild -s parameter; bump to
+ vdrplugin-rebuild-0.5
+
*gentoo-vdr-scripts-2.5_rc1 (23 Sep 2014)
11 Jul 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
diff --git a/var/vdr/tmp/Makefile b/var/vdr/tmp/Makefile
index 3009af8..538ce84 100644
--- a/var/vdr/tmp/Makefile
+++ b/var/vdr/tmp/Makefile
@@ -5,7 +5,7 @@ SHELL = /bin/bash
MYDIR = $(DESTDIR)/var/vdr/tmp
SUBDIRS =
BINS =
-CONFS = systemd_env
+CONFS = systemd_env plugins_skipped_ALL
all:
diff --git a/var/vdr/tmp/plugins_skipped_ALL b/var/vdr/tmp/plugins_skipped_ALL
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/var/vdr/tmp/plugins_skipped_ALL
diff --git a/vdrplugin-rebuild/vdrplugin-rebuild b/vdrplugin-rebuild/vdrplugin-rebuild
index 5fddc34..b5c5dab 100644
--- a/vdrplugin-rebuild/vdrplugin-rebuild
+++ b/vdrplugin-rebuild/vdrplugin-rebuild
@@ -18,7 +18,7 @@ if [[ `id -u` != 0 ]]; then
exit 1
fi
-R_VERSION="0.4"
+R_VERSION="0.5"
R_DBPATH="${ROOT}/usr/share/vdr/vdrplugin-rebuild"
R_PORTAGEQ="`type -p portageq 2>/dev/null`"
if [[ -z ${R_PORTAGEQ} ]]; then
@@ -258,7 +258,7 @@ db_plug_merge() {
echo
case ${R_OPTION_PM} in
- portage) emerge --ignore-default-opts --oneshot --nodeps ${R_PM_OPTS} ${tomerge[@]};;
+ portage) emerge --ignore-default-opts --oneshot --nodeps --keep-going ${R_PM_OPTS} ${tomerge[@]};;
paludis) cave resolve -1x -Cs ${R_PM_OPTS} ${tomerge[@]};;
*) echo "** Unsupported package manager"; phelp; exit 1;;
esac