r41: Minor bugfix (implicit placement warning)

diff --git a/changelog.CARNet b/changelog.CARNet
index 19b1783..cf35e02 100644 (file)
--- a/changelog.CARNet
+++ b/changelog.CARNet
@@ -1,3 +1,10 @@
+carnet-tools-cn (2.1-1) testing; urgency=low
+
+  * cp-update: Ispravka uvjeta za upozorenje kod implicitnog 
+     pozicioniranja ubacenog bloka na kraj datoteke
+
+ -- Damir Dzeko <ddzeko@srce.hr>  Tue, 05 Apr 2005 11:24:20 +0200
+
 carnet-tools-cn (2.1) testing; urgency=low
 
   * novi cp-update i man-stranice: cp-update(1), carnet-tools(7)

diff --git a/cp-update b/cp-update
index 2207c40..ecac2f7 100755 (executable)
--- a/cp-update
+++ b/cp-update
@@ -299,8 +299,8 @@ sub add() {
       }
       ++ $lineNo;
     }
-    if (! $added) {
-      warn "$ProgramName: Inserting lines at the end implicitly!\n";
+    if ($MatchLine and ! $added) {
+      warn "$ProgramName: Inserting lines at the end implicitly! No '$MatchLine'\n";
       push(@Lines, $StdinContent);
     }
   }

diff --git a/test/test1.ok b/test/test1.ok
deleted file mode 100644 (file)
index 9d5ab7a..0000000
--- a/test/test1.ok
+++ /dev/null
@@ -1,32 +0,0 @@
-This is the top of the test file for cp-update maintenance team
-so they can check is everything ok with the script. Empty line:
-
-# Here we have a piece that looks like a comment
-; following line says that you should not delete it:
- -- DO NOT DELETE THIS LINE!
-
-[samba]
-  brasil = de Janeiro
-
-<apache>
-  mohican = the last
-</apache>
-
-options {
-  something +more;
-}
-
-# update this
-
-# Begin update by CARNet package broken
-this is for compatibility with older version which did not add
- -- DO NOT DELETE THIS LINE!
-string after the package name
-# End update by CARNet package broken
-
-# Begin update by CARNet package broken2
-
-It's the end of the file and guess what? This line does not end with \n
-# Begin update by CARNet package test1 -- DO NOT DELETE THIS LINE!
-Block inserted by test1
-# End update by CARNet package test1 -- DO NOT DELETE THIS LINE!

diff --git a/test/test2.ok b/test/test2.ok
deleted file mode 100644 (file)
index ebc464d..0000000
--- a/test/test2.ok
+++ /dev/null
@@ -1,35 +0,0 @@
-# Begin update by CARNet package test2 -- DO NOT DELETE THIS LINE!
-Block inserted by test2
-# End update by CARNet package test2 -- DO NOT DELETE THIS LINE!
-This is the top of the test file for cp-update maintenance team
-so they can check is everything ok with the script. Empty line:
-
-# Here we have a piece that looks like a comment
-; following line says that you should not delete it:
- -- DO NOT DELETE THIS LINE!
-
-[samba]
-  brasil = de Janeiro
-
-<apache>
-  mohican = the last
-</apache>
-
-options {
-  something +more;
-}
-
-# update this
-
-# Begin update by CARNet package broken
-this is for compatibility with older version which did not add
- -- DO NOT DELETE THIS LINE!
-string after the package name
-# End update by CARNet package broken
-
-# Begin update by CARNet package broken2
-
-It's the end of the file and guess what? This line does not end with \n
-# Begin update by CARNet package test1 -- DO NOT DELETE THIS LINE!
-Block inserted by test1
-# End update by CARNet package test1 -- DO NOT DELETE THIS LINE!

diff --git a/test/test3.ok b/test/test3.ok
deleted file mode 100644 (file)
index 5bd66d8..0000000
--- a/test/test3.ok
+++ /dev/null
@@ -1,38 +0,0 @@
-# Begin update by CARNet package test2 -- DO NOT DELETE THIS LINE!
-Block inserted by test2
-# End update by CARNet package test2 -- DO NOT DELETE THIS LINE!
-This is the top of the test file for cp-update maintenance team
-so they can check is everything ok with the script. Empty line:
-
-# Here we have a piece that looks like a comment
-; following line says that you should not delete it:
- -- DO NOT DELETE THIS LINE!
-
-[samba]
-  brasil = de Janeiro
-
-<apache>
-  mohican = the last
-</apache>
-# Begin update by CARNet package test3 -- DO NOT DELETE THIS LINE!
-Block inserted by test3
-# End update by CARNet package test3 -- DO NOT DELETE THIS LINE!
-
-options {
-  something +more;
-}
-
-# update this
-
-# Begin update by CARNet package broken
-this is for compatibility with older version which did not add
- -- DO NOT DELETE THIS LINE!
-string after the package name
-# End update by CARNet package broken
-
-# Begin update by CARNet package broken2
-
-It's the end of the file and guess what? This line does not end with \n
-# Begin update by CARNet package test1 -- DO NOT DELETE THIS LINE!
-Block inserted by test1
-# End update by CARNet package test1 -- DO NOT DELETE THIS LINE!

diff --git a/test/test4.ok b/test/test4.ok
deleted file mode 100644 (file)
index 91077ac..0000000
--- a/test/test4.ok
+++ /dev/null
@@ -1,41 +0,0 @@
-# Begin update by CARNet package test2 -- DO NOT DELETE THIS LINE!
-Block inserted by test2
-# End update by CARNet package test2 -- DO NOT DELETE THIS LINE!
-This is the top of the test file for cp-update maintenance team
-so they can check is everything ok with the script. Empty line:
-
-# Here we have a piece that looks like a comment
-; following line says that you should not delete it:
- -- DO NOT DELETE THIS LINE!
-
-[samba]
-  brasil = de Janeiro
-
-<apache>
-  mohican = the last
-</apache>
-# Begin update by CARNet package test3 -- DO NOT DELETE THIS LINE!
-Block inserted by test3
-# End update by CARNet package test3 -- DO NOT DELETE THIS LINE!
-
-options {
-  something +more;
-}
-
-# update this
-
-# Begin update by CARNet package broken
-this is for compatibility with older version which did not add
- -- DO NOT DELETE THIS LINE!
-string after the package name
-# End update by CARNet package broken
-
-# Begin update by CARNet package broken2
-
-It's the end of the file and guess what? This line does not end with \n
-# Begin update by CARNet package test1 -- DO NOT DELETE THIS LINE!
-Block inserted by test1
-# End update by CARNet package test1 -- DO NOT DELETE THIS LINE!
-# Begin update by CARNet package test4 -- DO NOT DELETE THIS LINE!
-Block inserted by test4
-# End update by CARNet package test4 -- DO NOT DELETE THIS LINE!

diff --git a/test/test5.ok b/test/test5.ok
deleted file mode 100644 (file)
index 32192cd..0000000
--- a/test/test5.ok
+++ /dev/null
@@ -1,48 +0,0 @@
-# Begin update by CARNet package test2 -- DO NOT DELETE THIS LINE!
-Block inserted by test2
-# End update by CARNet package test2 -- DO NOT DELETE THIS LINE!
-This is the top of the test file for cp-update maintenance team
-so they can check is everything ok with the script. Empty line:
-
-# Here we have a piece that looks like a comment
-; following line says that you should not delete it:
- -- DO NOT DELETE THIS LINE!
-
-[samba]
-  brasil = de Janeiro
-; Begin update by CARNet package test5 -- DO NOT DELETE THIS LINE!
-test line 1 by test5
-test line 2 by test5
-test line 3 by test5
-test line 4 by test5
-test line 5 by test5
-; End update by CARNet package test5 -- DO NOT DELETE THIS LINE!
-
-<apache>
-  mohican = the last
-</apache>
-# Begin update by CARNet package test3 -- DO NOT DELETE THIS LINE!
-Block inserted by test3
-# End update by CARNet package test3 -- DO NOT DELETE THIS LINE!
-
-options {
-  something +more;
-}
-
-# update this
-
-# Begin update by CARNet package broken
-this is for compatibility with older version which did not add
- -- DO NOT DELETE THIS LINE!
-string after the package name
-# End update by CARNet package broken
-
-# Begin update by CARNet package broken2
-
-It's the end of the file and guess what? This line does not end with \n
-# Begin update by CARNet package test1 -- DO NOT DELETE THIS LINE!
-Block inserted by test1
-# End update by CARNet package test1 -- DO NOT DELETE THIS LINE!
-# Begin update by CARNet package test4 -- DO NOT DELETE THIS LINE!
-Block inserted by test4
-# End update by CARNet package test4 -- DO NOT DELETE THIS LINE!

diff --git a/test/test6.ok b/test/test6.ok
deleted file mode 100644 (file)
index 1e6e4b7..0000000
--- a/test/test6.ok
+++ /dev/null
@@ -1,29 +0,0 @@
-This is the top of the test file for cp-update maintenance team
-so they can check is everything ok with the script. Empty line:
-
-# Here we have a piece that looks like a comment
-; following line says that you should not delete it:
- -- DO NOT DELETE THIS LINE!
-
-[samba]
-  brasil = de Janeiro
-
-<apache>
-  mohican = the last
-</apache>
-
-options {
-  something +more;
-}
-
-# update this
-
-# Begin update by CARNet package broken
-this is for compatibility with older version which did not add
- -- DO NOT DELETE THIS LINE!
-string after the package name
-# End update by CARNet package broken
-
-# Begin update by CARNet package broken2
-
-It's the end of the file and guess what? This line does not end with \n