Ticket #1124: ds-backup080109.py.patch

ds-backup.py

@@ -64 +64 @@
 
     ssh = '/usr/bin/ssh -F /dev/null -o "PasswordAuthentication no" -o "StrictHostKeyChecking no" -i "%s" -l "%s"' \
         % (keyfile, user)
-    rsync = "/usr/bin/rsync -z -rlt --partial --delete --timeout=160 -e '%s' '%s' '%s' " % \
+    rsync = "/usr/bin/rsync -a -z -rlt --partial --delete --timeout=160 -e '%s' '%s' '%s' " % \
             (ssh, from_path, to_path)
     print rsync
     rsync_p = popen2.Popen3(rsync, True)
@@ -87 +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 -z -rlt --timeout 10 -T /tmp -e '%s' '%s' '%s' "
+    rsync = ("/usr/bin/rsync -a -z -rlt --timeout 10 -T /tmp -e '%s' '%s' '%s' "
              % (ssh, tmpfile[1], BACKUP_SERVER+':/var/lib/ds-backup/completion/'+user))
     rsync_p = popen2.Popen3(rsync, True)
     rsync_exit = os.WEXITSTATUS(rsync_p.wait())
@@ -109 +109 @@
     fh.close()
     return data
 
-def get_soas_info(info):
-  soas_dir = '/home/liveuser/.sugar/soas/'
-  fh = open(os.path.join(soas_dir, info),'r')
+# SoaS : def to retreive sugar info from registering an SoaS
+def get_identifier_info(info):
+  identifier_dir = os.path.expanduser('~') + '/.sugar/default/identifiers/'
+  fh = open(os.path.join(identifier_dir, info),'r')
   data = fh.read().rstrip('\0\n')
   fh.close()
   return data
@@ -123 +124 @@
        sn = read_ofw('mfg-data/SN')
        BACKUP_SERVER = 'schoolserver'
     else:
-      # HAM : SoaS
-      # sn = 'SHF00000000'
-      # client = gconf.client_get_default()
-      # sn = client.get_string('/desktop/sugar/soas_serial')
-      sn = get_soas_info('sn')
-      BACKUP_SERVER = get_soas_info('backup_url')
+      # retrieve the serial and backup_url 
+      sn = get_identifier_info('sn')
+      BACKUP_SERVER = get_identifier_info('backup_url')
       
     backup_url = 'http://'+BACKUP_SERVER+'/backup/1'