Attachment 32399 Details for Bug 13068 – Bug 13068: Counterpatch follow-up for controlling workflow

[patch] Bug 13068: Counterpatch follow-up for controlling workflow

Bug-13068-Counterpatch-follow-up-for-controlling-w.patch (text/plain), 3.17 KB, created by Marcel de Rooy on 2014-10-16 08:22:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2014-10-16 08:22:16 UTC

Size: 3.17 KB

patch

obsolete

>From 91ee1c02824121b604f5d0b1fc0c50d5ac6955e1 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Thu, 16 Oct 2014 09:58:24 +0200
>Subject: [PATCH] Bug 13068: Counterpatch follow-up for controlling workflow
>Content-Type: text/plain; charset=utf-8
>
>The workflow for dev updates can be altered with pref DevUpdateControl:
>[1] DevUpdateControl= PROD for production machines: Do not execute
>    RunRemainingDevUpdates, so only official db revs. This is the default.
>[2] DevUpdateControl= RESET: Reinstall dev updates after each official db rev.
>[3] DevUpdateControl= ALWAYS: Run the dev updates at each upgrade.
>[4] DevUpdateControl=TRACK: Only install new dev updates. It does not reset
>    the local pref listing all recently applied dev updates. ONLY use this
>    if you know what you are doing!
>---
> installer/data/mysql/updatedatabase.pl |   12 +++++++++---
> 1 files changed, 9 insertions(+), 3 deletions(-)
>
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 5ebc371..22f0e9e 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -50,6 +50,7 @@ use constant ATOMICUPD_PREF => '_LocalAtomicUpdates';
> my $debug = 0;
> my $aupd = { #hash for atomic updates
>     location  => C4::Context->config('intranetdir')."/installer/data/mysql/atomicupdate",
>+    mode      => C4::Context->preference('DevUpdateControl') // 'PROD',
>     remember  => C4::Context->preference(ATOMICUPD_PREF)//'',
>     skipfiles => {
>         'Bug-4246-Talking-Tech-itiva-phone-notifications.pl' => 1,
>@@ -8818,7 +8819,7 @@ if ( CheckVersion($DBversion) ) {
> # This point marks the end of the approved database revisions.
> # The following line runs proposed patches found in atomicupdate. On a
> # production system, it will [should] not find any.
>-RunRemainingAtomicUpdates( $aupd );
>+RunRemainingAtomicUpdates( $aupd ) if $aupd->{mode} ne 'PROD';
> 
> =head1 FUNCTIONS
> 
>@@ -8842,7 +8843,8 @@ sub RunRemainingAtomicUpdates {
>            print "Skipping $upd as installed official db rev\n";
>            next;
>         }
>-        if( $atomicupd->{remember} =~ /(^|;)$upd;/ ) {
>+        if( $atomicupd->{mode} ne 'ALWAYS' &&
>+            $atomicupd->{remember} =~ /(^|;)$upd;/ ) {
>         #Skip files that have recently been applied
>         #Note that an official db rev erases this list
>            print "Skipping $upd as recently applied dev update\n";
>@@ -8900,7 +8902,7 @@ sub ExecDBRev {
>         print "Dev upgrade $file done\n";
>         _atomic_memory( $atomicupd, $file ) if $rv;
>     } else {
>-        _atomic_memory( $atomicupd ); #Official db rev clears the atomic pref
>+        _atomic_memory( $atomicupd ); #Official dbrev may clear atomic pref
>         SetVersion($version);
>         print "Upgrade to $version done (Bug $bugno - $descr)\n";
>     }
>@@ -8908,6 +8910,10 @@ sub ExecDBRev {
> 
> sub _atomic_memory {
>     my ( $atomicupd, $upd ) = @_;
>+
>+    return if $atomicupd->{mode} eq 'ALWAYS'; # ignores the pref
>+    return if !$upd &&  $atomicupd->{mode} eq 'TRACK'; # no reset
>+
>     $atomicupd->{remember}= $upd? $atomicupd->{remember}."$upd;": '';
>     C4::Context->set_preference( ATOMICUPD_PREF, $atomicupd->{remember} );
> }
>-- 
>1.7.7.6

Actions: View | Diff | Splinter Review

Attachments on bug 13068: 32173 | 32174 | 32175 | 32177 | 32178 | 32179 | 32180 | 32185 | 32294 | 32300 | 32398 | 32399 | 32525 | 32526 | 32658 | 32659 | 32784 | 32785 | 32839 | 32840 | 32841 | 32842 | 32843 | 32919 | 32921 | 33859 | 34070 | 34071 | 34072 | 34949 | 34950 | 34951 | 34960 | 34998 | 35000 | 35001 | 35002 | 35003 | 35366 | 35367 | 35368 | 35370 | 36716 | 36717 | 36718 | 36719 | 36779 | 36780 | 36781 | 36792 | 37061 | 37062 | 37063 | 37064 | 37065 | 37066 | 37075 | 37076 | 37491