From 40470d248929fd89cc7b9a3db2b7b5e4493140d6 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 14 Nov 2012 14:46:15 +0530 Subject: [PATCH] only tar for backup (no tar+gzip) --- public/js/wn/ui/toolbar/toolbar.js | 1 + webnotes/utils/backups.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/js/wn/ui/toolbar/toolbar.js b/public/js/wn/ui/toolbar/toolbar.js index 2d7482524b..dfc85a19ab 100644 --- a/public/js/wn/ui/toolbar/toolbar.js +++ b/public/js/wn/ui/toolbar/toolbar.js @@ -116,6 +116,7 @@ wn.ui.toolbar.clear_cache = function() { } wn.ui.toolbar.download_backup = function() { + msgprint("Your download is being built, this may take a few moments..."); $c('webnotes.utils.backups.get_backup',{},function(r,rt) {}); return false; } diff --git a/webnotes/utils/backups.py b/webnotes/utils/backups.py index 3c7a8c6c20..35d80069f7 100644 --- a/webnotes/utils/backups.py +++ b/webnotes/utils/backups.py @@ -72,7 +72,7 @@ class BackupGenerator: #Generate a random name using today's date and a 8 digit random number for_db = todays_date + "_" + random_number + "_database.sql.gz" - for_files = todays_date + "_" + random_number + "_files.tar.gz" + for_files = todays_date + "_" + random_number + "_files.tar" backup_path = get_backup_path() self.backup_path_db = os.path.join(backup_path, for_db) self.backup_path_files = os.path.join(backup_path, for_files) @@ -89,7 +89,7 @@ class BackupGenerator: def zip_files(self): files_path = os.path.join(os.path.dirname(os.path.abspath(conf.__file__)), 'public', 'files') - cmd_string = """tar -czf %s %s""" % (self.backup_path_files, files_path) + cmd_string = """tar -cf %s %s""" % (self.backup_path_files, files_path) err, out = webnotes.utils.execute_in_shell(cmd_string) def take_dump(self):