Ticket #1976: SL1976.patch

src/jarabe/desktop/schoolserver.py

@@ -48 +48 @@
 
     return serial
 
-def store_identifiers(serial_number, uuid, backup_url):
+def store_identifiers(serial_number, uuid, backup_url=None):
     """  Stores the serial number, uuid and backup_url
     in the identifier folder inside the profile directory
     so that these identifiers can be used for backup. """
@@ -69 +69 @@
     uuid_file.write(uuid)
     uuid_file.close()
 
-    if os.path.exists(os.path.join(identifier_path, 'backup_url')):
-        os.remove(os.path.join(identifier_path, 'backup_url'))
-    backup_url_file = open(os.path.join(identifier_path, 'backup_url'), 'w')
-    backup_url_file.write(backup_url)
-    backup_url_file.close()
+    if backup_url:
+        if os.path.exists(os.path.join(identifier_path, 'backup_url')):
+            os.remove(os.path.join(identifier_path, 'backup_url'))
+        backup_url_file = open(os.path.join(identifier_path, 'backup_url'), 'w')
+        backup_url_file.write(backup_url)
+        backup_url_file.close()
 
 class RegisterError(Exception):
     pass
@@ -108 +109 @@
         sn = sn or 'SHF00000000'
         uuid_ = uuid_ or '00000000-0000-0000-0000-000000000000'
     else:
-        sn = generate_serial_number()
-        uuid_ = str(uuid.uuid1())
-
-    setting_name = '/desktop/sugar/collaboration/jabber_server'
-    jabber_server = client.get_string(setting_name)
-    store_identifiers(sn, uuid_, jabber_server)
-
-    if jabber_server:
-        url = 'http://' + jabber_server + ':8080/'
+        identifier_path = os.path.join(env.get_profile_path(), 'identifiers')
+        newids = False
+        try:
+            sn = open(os.path.join(identifier_path, 'sn')).read()
+        except:
+            sn = generate_serial_number()
+            newids = True
+        try:
+            uuid_ = open(os.path.join(identifier_path, 'sn')).read()
+        except:
+            uuid_ = str(uuid.uuid1())
+            newids = True
+        if newids:
+            store_identifiers(sn, uuid_)
 
     nick = client.get_string('/desktop/sugar/user/nick')