Ticket #916: ds-backup072509.py.patch

ds-backup.py

@@ -27 +27 @@
 import glob
 import popen2
 import re
+import gconf
 
 from sugar import env
 from sugar import profile
@@ -86 +87 @@
     # Note: the dest dir on the XS is watched via
     # inotify - so we avoid creating tempfiles there.
     tmpfile = tempfile.mkstemp()
-    rsync = ("/usr/bin/rsync -a -rlt --timeout 10 -T /tmp -e '%s' '%s' '%s' "
+    rsync = ("/usr/bin/rsync -z -rlt --timeout 10 -T /tmp -e '%s' '%s' '%s' "
              % (ssh, tmpfile[1], 'schoolserver:/var/lib/ds-backup/completion/'+user))
     rsync_p = popen2.Popen3(rsync, True)
     rsync_exit = os.WEXITSTATUS(rsync_p.wait())
@@ -108 +109 @@
     fh.close()
     return data
 
+def get_soas_sn():
+  soas_dir = '/home/liveuser/.sugar/soas/'
+  fh = open(os.path.join(soas_dir, 'sn'),'r')
+  data = fh.read().rstrip('\0\n')
+  fh.close()
+  return data
+
+def get_soas_uuid():
+  soas_dir = '/home/liveuser/.sugar/soas/'
+  fh = open(os.path.join(soas_dir, 'uuid'),'r')
+  data = fh.read().rstrip('\0\n')
+  fh.close()
+  return data
+
 # if run directly as script
 if __name__ == "__main__":
 
@@ -116 +131 @@
     if have_ofw_tree():
         sn = read_ofw('mfg-data/SN')
     else:
-        sn = 'SHF00000000'
+      # HAM : SoaS
+      # sn = 'SHF00000000'
+      # client = gconf.client_get_default()
+      # sn = client.get_string('/desktop/sugar/soas_serial')
+      sn = get_soas_sn()
 
     ds_path = env.get_profile_path('datastore')
     pk_path = os.path.join(env.get_profile_path(), 'owner.key')