/[rdiff-backup]/rdiff-backup/rdiff_backup/Main.py
ViewVC logotype

Diff of /rdiff-backup/rdiff_backup/Main.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.96 by bescoto, Wed Nov 2 06:28:17 2005 UTC revision 1.97 by bescoto, Sat Nov 19 03:10:03 2005 UTC
# Line 87  def parse_cmdlineoptions(arglist): Line 87  def parse_cmdlineoptions(arglist):
87                    "user-mapping-file=", "verbosity=", "verify",                    "user-mapping-file=", "verbosity=", "verify",
88                    "verify-at-time=", "version"])                    "verify-at-time=", "version"])
89          except getopt.error, e:          except getopt.error, e:
90                  commandline_error("Bad commandline options: %s" % str(e))                  commandline_error("Bad commandline options: " + str(e))
91    
92          for opt, arg in optlist:          for opt, arg in optlist:
93                  if opt == "-b" or opt == "--backup-mode": action = "backup"                  if opt == "-b" or opt == "--backup-mode": action = "backup"
# Line 231  def final_set_action(rps): Line 231  def final_set_action(rps):
231          else: action = "backup"          else: action = "backup"
232    
233  def commandline_error(message):  def commandline_error(message):
234          sys.stderr.write("Error: %s\n" % message)          Log.FatalError(message + "\nSee the rdiff-backup manual page for "
235          sys.stderr.write("See the rdiff-backup manual page for instructions\n")                                     "more information.")
         sys.exit(2)  
236    
237  def misc_setup(rps):  def misc_setup(rps):
238          """Set default change ownership flag, umask, relay regexps"""          """Set default change ownership flag, umask, relay regexps"""
# Line 291  def cleanup(): Line 290  def cleanup():
290          Log.close_logfile()          Log.close_logfile()
291          if not Globals.server: SetConnections.CloseConnections()          if not Globals.server: SetConnections.CloseConnections()
292    
293    def error_check_Main(arglist):
294            """Run Main on arglist, suppressing stack trace for routine errors"""
295            try: Main(arglist)
296            except SystemExit: raise
297            except Exception, exc:
298                    errmsg = robust.is_routine_fatal(exc)
299                    if errmsg:
300                            Log.exception(2, 6)
301                            Log.FatalError(errmsg)
302                    else:
303                            Log.exception(2, 2)
304                            raise
305    
306  def Main(arglist):  def Main(arglist):
307          """Start everything up!"""          """Start everything up!"""
308          parse_cmdlineoptions(arglist)          parse_cmdlineoptions(arglist)
# Line 304  def Main(arglist): Line 316  def Main(arglist):
316          cleanup()          cleanup()
317          if return_val is not None: sys.exit(return_val)          if return_val is not None: sys.exit(return_val)
318    
   
319  def Backup(rpin, rpout):  def Backup(rpin, rpout):
320          """Backup, possibly incrementally, src_path to dest_path."""          """Backup, possibly incrementally, src_path to dest_path."""
321          global incdir          global incdir

Legend:
Removed from v.1.96  
changed lines
  Added in v.1.97

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26