Attachment 911414 Details for Bug 1111143 – additional fix to handle the legacy format in cleanup, not prepare

[patch] additional fix to handle the legacy format in cleanup, not prepare

0001-move-legacy-connection-handling-to-the-cleanup-phase.patch (text/plain), 2.41 KB, created by Pavel Šimerda (pavlix) on 2014-06-23 12:44:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Šimerda (pavlix)

Created: 2014-06-23 12:44:58 UTC

Size: 2.41 KB

patch

obsolete

>From 88a20efc80dab3343cf35976956e75a1c349caf1 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <psimerda@redhat.com>
>Date: Mon, 23 Jun 2014 14:32:59 +0200
>Subject: [PATCH] move legacy connection handling to the cleanup phase
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1111143
>---
> dnssec-trigger-script.in | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
>diff --git a/dnssec-trigger-script.in b/dnssec-trigger-script.in
>index efeb6aa..d031ffd 100644
>--- a/dnssec-trigger-script.in
>+++ b/dnssec-trigger-script.in
>@@ -5,8 +5,6 @@
> @author: Pavel Å imerda <psimerda@redhat.com>
> """
> 
>-from __future__ import print_function
>-
> from gi.repository import NMClient
> import os, sys, shutil, glob, subprocess
> import logging, logging.handlers
>@@ -364,16 +362,6 @@ class Application:
>     def run_prepare(self):
>         """Prepare for dnssec-trigger."""
> 
>-        old_zones = glob.glob("/var/run/dnssec-trigger/????????-????-????-????-????????????")
>-        if old_zones:
>-            log.info("Converting to new zone cache format")
>-            with open("/var/run/dnssec-trigger/zones", "a") as target:
>-                for filename in old_zones:
>-                    with open(filename) as source:
>-                        for line in source:
>-                            print(line.strip(), file=target)
>-                    os.remove(filename)
>-
>         if not self.nm_handles_resolv_conf():
>             log.info("Backing up /etc/resolv.conf")
>             shutil.copy(self.resolvconf, self.resolvconf_backup)
>@@ -384,6 +372,18 @@ class Application:
>         stored_zones = Store('zones')
>         unbound_zones = UnboundZoneConfig()
> 
>+        # provide upgrade path for previous versions
>+        old_zones = glob.glob("/var/run/dnssec-trigger/????????-????-????-????-????????????")
>+        if old_zones:
>+            log.info("Reading zones from the legacy zone store")
>+            with open("/var/run/dnssec-trigger/zones", "a") as target:
>+                for filename in old_zones:
>+                    with open(filename) as source:
>+                        log.debug("Reading zones from {}".format(filename))
>+                        for line in source:
>+                            stored_zones.add(line.strip())
>+                        os.remove(filename)
>+
>         log.debug("clearing unbound configuration")
>         for zone in stored_zones:
>             unbound_zones.remove(zone)
>-- 
>1.8.5.5
>

Actions: View | Diff

Attachments on bug 1111143: 910419 | 911414