Attachment 9789 Details for Bug 31074

[patch] Drop old UCR variables

0001-Bug-31074-up-Drop-old-UCR-variables.patch (text/plain), 3.67 KB, created by Philipp Hahn on 2019-01-07 08:24 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2019-01-07 08:24 CET

Size: 3.67 KB

patch

obsolete

>From ec4ed1c261c26103e4789fbabef19f1cd2dc7fca Mon Sep 17 00:00:00 2001
>Message-Id: <ec4ed1c261c26103e4789fbabef19f1cd2dc7fca.1546845819.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Fri, 4 Jan 2019 12:56:30 +0100
>Subject: [PATCH] Bug #31074 up: Drop old UCR variables
>Organization: Univention GmbH, Bremen, Germany
>
>update/umc/nextversion
>update/custom/preup
>update/custom/postup
>---
> .../conffiles/etc/cron.d/univention-updater-check        | 16 ++++------------
> .../debian/univention-updater.postinst                   |  3 ---
> 2 files changed, 4 insertions(+), 15 deletions(-)
>
>diff --git a/base/univention-updater/conffiles/etc/cron.d/univention-updater-check b/base/univention-updater/conffiles/etc/cron.d/univention-updater-check
>index 8e6c516013..4e3bde4437 100644
>--- a/base/univention-updater/conffiles/etc/cron.d/univention-updater-check
>+++ b/base/univention-updater/conffiles/etc/cron.d/univention-updater-check
>@@ -3,19 +3,11 @@
> PATH=/usr/sbin:/usr/bin:/sbin:/bin
> 
> @!@
>-disabled = ''
>-debug = ''
>-if not configRegistry.is_true('update/check/cron/enabled', False):
>-        disabled = '# '
>-if not configRegistry.get('update/check/cron/debug','no').lower() in ('yes','true','enabled','1','2','3','4'):
>-        debug = '2> /dev/null > /dev/null'
>+disabled = '' if configRegistry.is_true('update/check/cron/enabled') else '#'
>+debug = '' if configRegistry.is_true('update/check/cron/debug') else '2>/dev/null'
> print '%s%s   root   [ -x /usr/share/univention-updater/univention-updater-check ] && /usr/sbin/jitter 600 /usr/share/univention-updater/univention-updater-check %s' % (disabled, configRegistry.get('update/check/cron/entry', '5 * * * *'), debug)
> 
>-disabled = ''
>-debug = ''
>-if not configRegistry.is_true('update/check/boot/enabled', False):
>-        disabled = '# '
>-if not configRegistry.get('update/check/boot/debug','no').lower() in ('yes','true','enabled','1','2','3','4'):
>-        debug = '2> /dev/null > /dev/null'
>+disabled = '' if configRegistry.is_true('update/check/boot/enabled') else '#'
>+debug = '' if configRegistry.is_true('update/check/boot/debug') else '2>/dev/null'
> print '%s@reboot   root   [ -x /usr/share/univention-updater/univention-updater-check ] && /usr/sbin/jitter 30 /usr/share/univention-updater/univention-updater-check %s' % (disabled, debug)
> @!@
>diff --git a/base/univention-updater/debian/univention-updater.postinst b/base/univention-updater/debian/univention-updater.postinst
>index b8e426fc76..085cea6f87 100644
>--- a/base/univention-updater/debian/univention-updater.postinst
>+++ b/base/univention-updater/debian/univention-updater.postinst
>@@ -73,7 +73,6 @@ if [ "$1" = "configure" ]; then
> 		update/warning/coloured?"no" \
> 		update/warning/lang?"default" \
> 		update/warning/tty?"/dev/tty1 /dev/tty2 /dev/tty3 /dev/tty4 /dev/tty5 /dev/tty6 /dev/tty7" \
>-		update/umc/nextversion?true \
> 		repository/online?no \
> 		repository/online/server?"${REPOSITORY}" \
> 		repository/online/unmaintained?no \
>@@ -82,8 +81,6 @@ if [ "$1" = "configure" ]; then
> 		repository/mirror/recreate_packages?no \
> 		repository/mirror/basepath?/var/lib/univention-repository \
> 		repository/credentials/'Univention Software Repository'/uris?'updates.software-univention.de updates-test.software-univention.de appcenter.software-univention.de appcenter-test.software-univention.de' \
>-		update/custom/preup?/var/lib/local-preup.sh \
>-		update/custom/postup?/var/lib/local-postup.sh \
> 		update/commands/update?"apt-get update" \
> 		update/commands/show?"apt-cache show" \
> 		update/commands/install?"apt-get -o DPkg::Options::=--force-confold -o DPkg::Options::=--force-overwrite -o DPkg::Options::=--force-overwrite-dir --trivial-only=no --assume-yes --quiet=1 install" \
>-- 
>2.11.0
>

Actions: View | Diff

Attachments on bug 31074: 9789