summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-06-16 13:58:06 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-06-16 08:18:10 +0200
commit61f7f0155465b14612f7ac29a12c442ff25031b4 (patch)
tree39c8c81e6da3d803dd760e8a6fc10f07ad474ecd /source4/scripting
parentd0b60f02dd3c324d4c990dae7334b228dddba075 (diff)
downloadsamba-61f7f0155465b14612f7ac29a12c442ff25031b4.tar.gz
samba-61f7f0155465b14612f7ac29a12c442ff25031b4.tar.bz2
samba-61f7f0155465b14612f7ac29a12c442ff25031b4.zip
s4-s3upgrade: Add my wins.dat and fix the parsing error
The issue was that the numbers at the end of the lines are space padded. Andrew Bartlett
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/samba3/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/samba3/__init__.py b/source4/scripting/python/samba/samba3/__init__.py
index a955be1a73..14db90ac51 100644
--- a/source4/scripting/python/samba/samba3/__init__.py
+++ b/source4/scripting/python/samba/samba3/__init__.py
@@ -304,7 +304,8 @@ def shellsplit(text):
if c == "\"":
inquotes = not inquotes
elif c in ("\t", "\n", " ") and not inquotes:
- ret.append(current)
+ if current != "":
+ ret.append(current)
current = ""
else:
current += c