Changeset 4f37a98

Timestamp:

2012-02-11T17:18:46Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dcf155d

Parents:

eb54f56

Message:

convert_purple fix: Don't barf on protocols without passwords. Bug #877.

File:

• utils/convert_purple.py (modified) (3 diffs)

utils/convert_purple.py

@@ -35 +35 @@
                 protocol = acc.getElementsByTagName('protocol')[0].firstChild.wholeText
                 name = acc.getElementsByTagName('name')[0].firstChild.wholeText
-                password = acc.getElementsByTagName('password')[0].firstChild.wholeText
+                try:
+                        password = acc.getElementsByTagName('password')[0].firstChild.wholeText
+                except IndexError:
+                        password = ''
                 if protocol.startswith('prpl-'):
                         protocol = protocol[5:]
@@ -53 +56 @@
         print
         for acc in accs:
-                print 'account add %s %s %s' % acc
+                print 'account add %s %s "%s"' % acc
 
 def bitlbee_x(*args):
@@ -85 +88 @@
         
         print
-        print 'Write the following XML data to a file called %s.xml (rename it if'
+        print 'Write the following XML data to a file called %s.xml (rename it if' % user.lower()
         print 'you want to use a different nickname). It should be in the directory where'
         print 'your BitlBee account files are stored (most likely /var/lib/bitlbee).'