equal
deleted
inserted
replaced
181 self.dbuser, backupfile, |
181 self.dbuser, backupfile, |
182 self.encoding, |
182 self.encoding, |
183 keepownership=False, |
183 keepownership=False, |
184 drop=drop): |
184 drop=drop): |
185 if os.system(cmd): |
185 if os.system(cmd): |
186 raise Exception('Failed command: %s' % cmd) |
186 print '-> Failed command: %s' % cmd |
|
187 if not confirm('Continue anyway?', default='n'): |
|
188 raise Exception('Failed command: %s' % cmd) |
187 |
189 |
188 def merge_args(self, args, query_args): |
190 def merge_args(self, args, query_args): |
189 if args is not None: |
191 if args is not None: |
190 args = dict(args) |
192 args = dict(args) |
191 for key, val in args.items(): |
193 for key, val in args.items(): |