From 773c9c93accf90fb4663a26b94aa6d26eb52c62a Mon Sep 17 00:00:00 2001
From: Marius Vollmer <mvollmer@redhat.com>
Date: Tue, 11 Apr 2017 09:02:01 +0300
Subject: [PATCH 14/16] networkmanager: Don't use complex checkpoints with NM
 1.6

commit: 235938704a883f2ee4943fc55456523454eb6606

Closes #7025
Reviewed-by: Stef Walter <stefw@redhat.com>
---
 dist/networkmanager/Makefile.deps         | Bin 4668 -> 4668 bytes
 dist/networkmanager/network.min.js        | Bin 237120 -> 237090 bytes
 dist/networkmanager/network.min.js.map    | Bin 1081328 -> 1081108 bytes
 dist/networkmanager/test-utils.min.js.map | Bin 419740 -> 419740 bytes
 pkg/networkmanager/interfaces.js          |   4 +---
 5 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dist/networkmanager/Makefile.deps b/dist/networkmanager/Makefile.deps
index 7767a4975d9ad61c4b5c4b57dd76d3200bdf4df5..9dc5ac02f38061f1c1d7ecc1da61879d65635def 100644
GIT binary patch
delta 18
Ycmdm^vPWftJG-Hk0T3B%^m``=06H-S0{{R3

delta 18
Zcmdm^vPWftJG+6EiMf@b(MG>_f&e;-1`hxL

diff --git a/dist/networkmanager/network.min.js b/dist/networkmanager/network.min.js
index 22dbcd30f993235e28a7f68165e6a60e09865194..362a6b5aa5e2d51710b71e4ebd4e74ac516b265b 100644
GIT binary patch
delta 26
gcmX@Ghi}myz70znnh!O!A8KF(Vy5kf8kp;30l5SWyZ`_I

delta 37
scmZ3qhws21z70znSk=@N6jP@kbY+xiUfj^WxPcLfnYJ%(V6K-103+%S?f?J)

diff --git a/dist/networkmanager/network.min.js.map b/dist/networkmanager/network.min.js.map
index 3f13ded0078fa4d6a51dedd3bfd1aee93bcf1954..4b1f5743ea0a23e86abf785547953dc410094c29 100644
GIT binary patch
delta 588
zcmezH-*L)6#|eod#;F#jY01fkM#jkoDXC^@iRKn&lk*uxC;sD~?lp;rcjK~^b0qVf
z9d-O29UarXbzFf|roWE1lcTd^hSTPnxh-Oh1)CYSgh?=IyDg49QzKE9;Z^433|8o(
z6ADybS>j~v?qN2)(1TG#+#Frjz}MQ{D|h-F4@ODGyzSdO7_GP&&8B}026MSX81FGM
znoNHc$|%L8Z?K&$jB%ADWBK%r`5?Z@_OtnnJZ56Wrry3f!H$l>rbbRW?v9RuF4o?`
zMcdymWjuLV%qZQ@8!TB-0+$Rm+<vZ-DNI;AGcN=~GThQ)yLB&9usD;p<@5<lm?W7j
zO}4LI!o(z5Uu+r*v8XH+YL924p=B7Vcdgx%(zU}N>YQQ9k~6e1l%*77C`&EDRF-A}
zQzis84rFMshqY(Alj(N5eN2*4jD_tHH<-3Z++cQhoc>UfMZ4WViUo*SftU@5*@2j2
zyMYwvqa#=&e0u+6o}l)M`<&Y=?sJ7`PUqs})@0RGsE)~-&d0?qJ^lA;F3$D_PHrIP
S0b*Vt<^y8>?G2m)1!VxGsIt%i

delta 761
zcmbR8&+)^5#|eodspiQBW(MX41}RDACYFijW~nL0lk*uxC;sD~o;Q()cjK~^b99TH
z9d-O29UarXbzFf|roWDf6Ob-(0&{a*bTUC)on%L6$8wj=8FO327)v(4-5e&tl<B_M
z^-N7{RfboYlQUSgi%uv|ZDom*wY!IQhL^8Su%lye1<)vWN5?=HYfn#obhQS)*6v<~
znNX!wz7UllGT6h~)4OQ<A`eC@Zbt3tcY_%v8H=`m4`#f_C~Hvx)nHi$H5;bGKg)3Y
zr%=XKl8gq^=jJm?F=d%<-<i+IV<uK^>J4#^sS(UQ-oa(tZ!cv$d0EUX-On4%vEHGk
z+jmtmg$Xm}P8aND5@E`)+^*is6fDk^sXe`B36msKhUxa{OPH7>>&s0;Ax4*_!hD)&
zY8i$aD%S2v+1g<cb<Qwl$vN5>%2LWPl%-Z+Doe9~DVr{_k4ccxa=X?(CP^vA(sq{{
zOxs;<FuOZWXO(0T)CtK*ElyQPDorm|NGwWKNUbPHO)g1IQ7Fk*NJ>>m%d7yhGxHSu
zd=(7!rngD57_cg+sVOK<pAf<#&0-d#q}jerk_CuaftU@5*@2j2`!-3=M@O)xu<3?B
zc!Jvh-Q(Q;?;cl(rnLeP=<CPiL1+b%oa4{It%Kp5Y7Xx9Y7QPC<^^ItAm-m*%^@(e
F3;=dU>9+s?

diff --git a/dist/networkmanager/test-utils.min.js.map b/dist/networkmanager/test-utils.min.js.map
index ab49fec99a2ef09ad8e658b0f146cc39a4a31d59..5be39aef38187f18315c55fca55d831ab53f0191 100644
GIT binary patch
delta 94
zcmbPpUUJTP$q6Zv#;F#jY01fkM#jkoDXC^@iRKn&_D04@CX+uficWmRKV3kIk-KqC
g>l((^HB4LAFdN<x!KS7C;~i!oX4(Gn4(sYJ03od-P5=M^

delta 94
zcmbPpUUJTP$q6ZvspiQBW(MX41}RDACYFijW~nL0_7<iFDU&}iicWmRKV3kIk-KqC
g>l((^HB4LAFdN<x!KS7C;~i!oX4(Gn4(sYJ0QlP?iU0rr

diff --git a/pkg/networkmanager/interfaces.js b/pkg/networkmanager/interfaces.js
index 37e23dc..a90bde6 100644
--- a/pkg/networkmanager/interfaces.js
+++ b/pkg/networkmanager/interfaces.js
@@ -2069,10 +2069,8 @@ function with_checkpoint(model, modify, options) {
     //
     // https://bugzilla.redhat.com/show_bug.cgi?id=1378393
     // https://bugzilla.redhat.com/show_bug.cgi?id=1398316
-    //
-    // These bugs are expected to be fixed in NM 1.6
 
-    if (options.hack_does_add_or_remove && !model.at_least_version("1.6")) {
+    if (options.hack_does_add_or_remove) {
         modify();
         return;
     }
-- 
2.9.4