From b49a817bfb1e12151d316b5c1e92ac4fe0cc6e21 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Thu, 5 Jan 2012 17:25:44 +0100
Subject: [PATCH] Fixes for checkInstalledFiles script
- work on windows
- show unified instead of context diff
Change-Id: Id3ce927f9fdc9783ccb927bcac7d921941865023
Reviewed-by: Bill King <bill.king@nokia.com>
---
scripts/checkInstalledFiles.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/checkInstalledFiles.py b/scripts/checkInstalledFiles.py
index 249582a8b42..4825239b5a8 100755
--- a/scripts/checkInstalledFiles.py
+++ b/scripts/checkInstalledFiles.py
@@ -17,7 +17,7 @@ def referenceFile():
print "Unsupported platform: ", sys.platform
sys.exit(-1)
scriptDir = os.path.dirname(inspect.getfile(inspect.currentframe()))
- return scriptDir+'/../tests/reference/'+filename
+ return os.path.join(scriptDir,'..','tests', 'reference', filename)
def readReferenceFile():
# read file with old diff
@@ -76,7 +76,7 @@ def main():
print "Do not forget to commit", referenceFile()
else:
hasDiff = False
- for line in difflib.context_diff(readReferenceFile(), generateReference(rootdir), fromfile=referenceFile(), tofile="generated"):
+ for line in difflib.unified_diff(readReferenceFile(), generateReference(rootdir), fromfile=referenceFile(), tofile="generated"):
sys.stdout.write(line)
hasDiff = True
if hasDiff:
--
GitLab