]>
Commit | Line | Data |
---|---|---|
275f019c ER |
1 | --- bzr-fastimport-0.13.0/user_mapper.py~ 2013-01-19 14:01:00.135642260 +0200 |
2 | +++ bzr-fastimport-0.13.0/user_mapper.py 2013-01-19 14:01:47.191146251 +0200 | |
3 | @@ -43,16 +44,16 @@ | |
4 | line = line.strip() | |
5 | if len(line) == 0 or line.startswith('#'): | |
6 | continue | |
7 | - old, new = line.split('=', 1) | |
8 | - old = old.strip() | |
9 | - new = new.strip() | |
10 | + | |
11 | + old = "=".join(line.split('=')[:-1]).strip() | |
12 | + new = "=".join(line.split('=')[-1:]).strip() | |
13 | if old == '@': | |
14 | self._default_domain = new | |
15 | continue | |
16 | # Parse each id into a name and email address | |
17 | old_name, old_email = self._parse_id(old) | |
18 | new_name, new_email = self._parse_id(new) | |
19 | - #print "found user map: %s => %s" % ((old_name, old_email), (new_name, new_email)) | |
20 | + #print >> sys.stderr, "found user map: %s => %s" % ((old_name, old_email), (new_name, new_email)) | |
21 | self._user_map[(old_name, old_email)] = (new_name, new_email) | |
22 | ||
23 | def _parse_id(self, id): |