From: Zoran Dzelajlija <Zoran.Dzelajlija@CARNet.hr>
Date: Fri, 24 Jun 2005 22:39:57 +0000 (+0000)
Subject: r72: cp_backup_conffile je vracao false u slucaju da backup nije
X-Git-Tag: debian/3.0.0~34
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=5bd6d3387ad27a739b4b688889816ff46a259b2c;p=carnet-upgrade.git

r72: cp_backup_conffile je vracao false u slucaju da backup nije
bilo potrebno izvrsiti, bez obzira na to je li pozvan kao
cp_check_* ili ne.
---

diff --git a/changelog.CARNet b/changelog.CARNet
index fe7eb21..5a86208 100644
--- a/changelog.CARNet
+++ b/changelog.CARNet
@@ -1,3 +1,10 @@
+carnet-tools-cn (2.4.1) sarge; urgency=low
+
+  * cp_backup_conffile je greskom vracao false ako backup nije
+    bio potreban.
+
+ -- Zoran Dzelajlija <jelly+paketi@srce.hr>  Sat, 25 Jun 2005 00:29:32 +0200
+
 carnet-tools-cn (2.4) testing; urgency=low
 
   * Kozmeticke ispravke.
diff --git a/functions.sh b/functions.sh
index f5326b9..28877c5 100644
--- a/functions.sh
+++ b/functions.sh
@@ -176,10 +176,10 @@ cp_backup_conffile() {
 
   [ -z "$check" ] && return 0
 
-  if [ "$check" -a "$did" ]; then
-    return 0
-  else
+  if [ "$check" -a ! "$did" ]; then
     return 3
+  else
+    return 0
   fi
 }