Bug 851374 - Don't use _useDDCopy, r=ahal

This commit is contained in:
Jonathan Griffin 2013-03-14 17:44:05 -07:00
parent d0e1dc1d0a
commit f191a5aa50

View File

@ -451,10 +451,7 @@ user_pref("capability.principal.codebase.p2.id", "http://%s:%s");
# In B2G, user.js is always read from /data/local, not the profile
# directory. Backup the original user.js first so we can restore it.
self._devicemanager._checkCmdAs(['shell', 'rm', '-f', '%s.orig' % self.userJS])
if self._devicemanager._useDDCopy:
self._devicemanager._checkCmdAs(['shell', 'dd', 'if=%s' % self.userJS, 'of=%s.orig' % self.userJS])
else:
self._devicemanager._checkCmdAs(['shell', 'cp', self.userJS, '%s.orig' % self.userJS])
self._devicemanager._checkCmdAs(['shell', 'dd', 'if=%s' % self.userJS, 'of=%s.orig' % self.userJS])
self._devicemanager.pushFile(os.path.join(profileDir, "user.js"), self.userJS)
self.updateProfilesIni(self.remoteProfile)