diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-11 15:19:05 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-11 15:19:05 +0000 |
| commit | bc4d7d372ffb676ad3433a24d6a46a43eea0be94 (patch) | |
| tree | 6357ca5b04b8e017150efd76e6fedd0243cfa084 | |
| parent | 62b009474c7d0ab9ecec352e3b8c9b6f912dd7fe (diff) | |
CWS-TOOLING: integrate CWS cwscheckapi6
2008-12-11 16:24:54 +0100 cn r265333 : #i97148 svn could return folder, but cwstouched hanldes only files. This is fixed here
| -rwxr-xr-x | solenv/bin/cwstouched.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/solenv/bin/cwstouched.py b/solenv/bin/cwstouched.py index 8a4a2f722d69..6ed3e67757b2 100755 --- a/solenv/bin/cwstouched.py +++ b/solenv/bin/cwstouched.py @@ -87,7 +87,6 @@ cwsWorkStamp=getCwsWorkStamp() minor = getMinor(cwsWorkStamp) oldWorkStamp = workstamp + "_" + minor - diff="svn diff --summarize --old=svn://svn.services.openoffice.org/ooo/tags/"+oldWorkStamp+" --new=svn://svn.services.openoffice.org/ooo/cws/"+cwsWorkStamp modules=[] @@ -96,8 +95,15 @@ modules=[] for outline in output.readlines(): if outline.find("svn://svn.services.openoffice.org"): index = outline.index(oldWorkStamp)+len(oldWorkStamp)+1 - newModule=outline[index:outline.index("/",index)] - if not modules.count(newModule): + newModule="" + if outline.find("/",index) != -1: + # seems to be a file + newModule=string.strip(outline[index:outline.index("/",index)]) + else: + #seems to be a folder + if len(outline[index:]) > 0: + newModule=string.strip(outline[index:]) + if newModule != "" and not modules.count(newModule): modules.append(newModule) for module in modules: |