From ac4bd72e13cb5ffa98188426e5ae57229eb2ed44 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Sun, 14 Oct 2018 23:16:04 +0200
Subject: [PATCH] minor changes of copyright notice
---
Environment/FlatAtmosphere/FlatAtmosphere.h | 17 +++++++++--------
Main/Environment.h | 17 +++++++++--------
Main/Stack.h | 17 +++++++++--------
do-copyright.py | 13 +++++++++----
4 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/Environment/FlatAtmosphere/FlatAtmosphere.h b/Environment/FlatAtmosphere/FlatAtmosphere.h
index 90582b3df..1495baac4 100644
--- a/Environment/FlatAtmosphere/FlatAtmosphere.h
+++ b/Environment/FlatAtmosphere/FlatAtmosphere.h
@@ -1,10 +1,11 @@
/**
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+*/
+
diff --git a/Main/Environment.h b/Main/Environment.h
index 90582b3df..1495baac4 100644
--- a/Main/Environment.h
+++ b/Main/Environment.h
@@ -1,10 +1,11 @@
/**
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+*/
+
diff --git a/Main/Stack.h b/Main/Stack.h
index 90582b3df..1495baac4 100644
--- a/Main/Stack.h
+++ b/Main/Stack.h
@@ -1,10 +1,11 @@
/**
- * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
- *
- * See file AUTHORS for a list of contributors.
- *
- * This software is distributed under the terms of the GNU General Public
- * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
- * the license.
- */
+ * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * See file AUTHORS for a list of contributors.
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+*/
+
diff --git a/do-copyright.py b/do-copyright.py
index 2953476d9..c771a570f 100755
--- a/do-copyright.py
+++ b/do-copyright.py
@@ -43,13 +43,18 @@ def checkNote(filename):
iLine += 1
# now check if copyright notice is already there and identical...
- isSame = True
+ isSame = False
if startNote>=0 and endNote>=0 and isCopyright:
+ isSame = True
noteLines = text.split('\n')
- for iLine in range(len(noteLines)):
- if noteLines[iLine] != lines[startNote+iLine]:
+ for iLine in range(len(noteLines)-2):
+ if startNote+iLine >= len(lines):
isSame = False
- print "not same: " + noteLines[iLine] + " " + lines[startNote+iLine]
+ break
+ if noteLines[iLine+1].strip(" \n") != lines[startNote+iLine].strip(" \n"):
+ isSame = False
+ print "not same: " + filename + " new=\'" + noteLines[iLine+1] + "\' vs old=\'" + lines[startNote+iLine].rstrip('\n') + "\'"
+ break
# check if notice is the same
if isSame:
--
GitLab