aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Molkentin <daniel.molkentin@nokia.com>2012-01-05 17:25:44 +0100
committerDaniel Molkentin <daniel.molkentin@nokia.com>2012-01-13 10:09:40 +0100
commitb49a817bfb1e12151d316b5c1e92ac4fe0cc6e21 (patch)
tree91b43f39ef37868e2dd5652b11f4c82ba6d9b8dc /scripts
parent6340f5cf378f38809cb1cd58ef5df2e3fe07066e (diff)
Fixes for checkInstalledFiles script
- work on windows - show unified instead of context diff Change-Id: Id3ce927f9fdc9783ccb927bcac7d921941865023 Reviewed-by: Bill King <bill.king@nokia.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/checkInstalledFiles.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/checkInstalledFiles.py b/scripts/checkInstalledFiles.py
index 249582a8b4..4825239b5a 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: