[gentoo-commits] proj/R_overlay:master commit in: /

[André Erdmann]

commit:     2a93dae11e32165040f1e9af3dd2e49d647c0e05
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Jul  9 16:26:48 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Jul  9 16:26:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=2a93dae1

move main.py -> roverlay.py

	modified:   README
	typechange: main.py
	renamed:    main.py -> roverlay.py

---
 README                 |    2 +-
 main.py                |  242 +-----------------------------------------------
 main.py => roverlay.py |    0
 3 files changed, 2 insertions(+), 242 deletions(-)

diff --git a/README b/README
index 542fa30..e9a9f6f 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ There is currently no "R overlay" script, only modules that implement functional
 
 Real tests are scheduled for July 10 - July 30.
 
-A main script is available. See ./main.py --help for usage.
+A main script is available. See ./roverlay.py --help for usage.
 
 
 == Configuration ==

diff --git a/main.py b/main.py
deleted file mode 100755
index ce1189f..0000000
--- a/main.py
+++ /dev/null
@@ -1,241 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-
-# roverlay modules will be imported later
-
-HIDE_EXCEPTIONS = False
-
-class DIE ( object ):
-	NOP          =  os.EX_OK
-	ERR          =  1
-	BAD_USAGE    =  os.EX_USAGE
-	ARG          =  9
-	CONFIG       =  os.EX_CONFIG
-	OV_CREATE    =  20
-	SYNC         =  30
-	CMD_LEFTOVER =  90
-	IMPORT       =  91
-	UNKNOWN      =  95
-	INTERRUPT    = 130
-
-	@staticmethod
-	def die ( msg=None, code=None ):
-		code = DIE.ERR if code is None else code
-		if msg is not None:
-			sys.stderr.write ( msg + "\n" )
-#		else:
-#			sys.stderr.write ( "died.\n" )
-		sys.exit ( code )
-	# --- end of die (...) ---
-
-# --- DIE: exit codes ---
-die = DIE.die
-
-
-if __name__ != '__main__':
-	die ( "Please don't import this script...", DIE.BAD_USAGE )
-
-
-# get args
-# imports roverlay.argutil (deleted when done)
-
-
-try:
-	import roverlay.argutil
-except ImportError:
-	if HIDE_EXCEPTIONS:
-		die ( "Cannot import roverlay modules!", DIE.IMPORT )
-	else:
-		raise
-
-COMMAND_DESCRIPTION = {
-	'sync'           : 'sync repos',
-	'create'         : 'create the overlay '
-	                    '(implies sync, override with --nosync)',
-#	'depres_console' : 'run an interactive depres console; TODO/REMOVE',
-	'nop'            : 'does nothing',
-}
-
-commands, config_file, additional_config, extra_opts = \
-	roverlay.argutil.parse_argv (
-		CMD_DESC=COMMAND_DESCRIPTION,
-		DEFAULT_CONFIG="R-overlay.conf"
-	)
-
-OPTION = extra_opts.get
-
-del roverlay.argutil
-
-# -- load config
-
-# imports: roverlay, roverlay.config.entryutil (if --help-config)
-
-try:
-	import roverlay
-except ImportError:
-	if HIDE_EXCEPTIONS:
-		die ( "Cannot import roverlay modules!", DIE.IMPORT )
-	else:
-		raise
-
-try:
-	conf = roverlay.load_config_file (
-		config_file,
-		extraconf=additional_config
-	)
-	del config_file, additional_config
-except:
-	if HIDE_EXCEPTIONS:
-		die ( "Cannot load config file {!r}.".format ( config_file ), DIE.CONFIG )
-	else:
-		raise
-
-if OPTION ( 'list_config' ):
-	try:
-		from roverlay.config.entryutil import list_entries
-		print ( "== main config file ==\n" )
-		print ( list_entries() )
-	except:
-		raise
-		die ( "Cannot list config entries!" )
-
-	EXIT_AFTER_CONFIG = True
-
-if OPTION ( 'print_config' ):
-	try:
-		conf.visualize ( into=sys.stdout )
-	except:
-		die ( "Cannot print config!" )
-	EXIT_AFTER_CONFIG = True
-
-
-if 'EXIT_AFTER_CONFIG' in locals() and EXIT_AFTER_CONFIG:
-	sys.exit ( os.EX_OK )
-
-
-# -- determine commands to run
-# (TODO) could replace this section when adding more actions
-# imports roverlay.remote, roverlay.overlay.creator
-
-actions = set ( filter ( lambda x : x != 'nop', commands ) )
-
-if 'sync' in actions and OPTION ( 'nosync' ):
-	die ( "sync command blocked by --nosync opt.", DIE.ARG )
-
-del commands
-
-
-if not actions:
-	# this happens if a command is nop
-	die ( "Nothing to do!", DIE.NOP )
-
-
-# -- import roverlay modules
-
-try:
-	from roverlay.remote          import RepoList
-	from roverlay.overlay.creator import OverlayCreator
-except ImportError:
-	if HIDE_EXCEPTIONS:
-		die ( "Cannot import roverlay modules!", DIE.IMPORT )
-	else:
-		raise
-
-
-
-# -- run methods (and some vars)
-# imports: nothing
-
-actions_done = set()
-set_action_done = actions_done.add
-
-def optionally ( call, option, *args, **kw ):
-	if OPTION ( option ):
-		return call ( *args, **kw )
-# --- end of optionally (...) ---
-
-#repo_list = None
-#overlay   = None
-def run_sync():
-	if "sync" in actions_done: return
-	try:
-		# set up the repo list
-		global repo_list
-		repo_list = RepoList (
-			sync_enabled   = not OPTION ( 'nosync' ),
-			force_distroot = OPTION ( 'force_distroot' )
-		)
-
-		## extra_opts->distdir ... TODO
-		if 'distdirs' in extra_opts:
-			repo_list.add_distdirs ( OPTION ( 'distdirs' ) )
-		else:
-			# default repo list
-			repo_list.load()
-
-		## this runs _nosync() or _sync(), depending on extra_opts->nosync
-		repo_list.sync()
-
-		set_action_done ( "sync" )
-
-	except KeyboardInterrupt:
-		die ( "Interrupted", DIE.INTERRUPT )
-	except:
-		if HIDE_EXCEPTIONS:
-				die (
-					"nosync() failed!" if OPTION ( "nosync" ) \
-						else "sync() failed!",
-					DIE.SYNC
-				)
-		else:
-			raise
-# --- end of run_sync() ---
-
-def run_overlay_create():
-	if "create" in actions_done: return
-	#run_sync()
-	try:
-		global overlay
-		overlay = OverlayCreator()
-		# explicitly allow overlay writing (FIXME: remove that in OverlayCreator)
-		overlay.can_write_overlay = OPTION ( 'write_overlay' )
-
-		repo_list.add_packages ( overlay.add_package )
-
-		overlay.run ( close_when_done=True )
-
-		optionally ( overlay.write_overlay, 'write_overlay' )
-		optionally ( overlay.show_overlay,  'show_overlay'  )
-		if OPTION ( 'print_stats' ): print ( "\n" + overlay.stats_str() )
-
-		set_action_done ( "create" )
-
-	except KeyboardInterrupt:
-		die ( "Interrupted", DIE.INTERRUPT )
-	except:
-		if HIDE_EXCEPTIONS:
-			die ( "Overlay creation failed.", DIE.OV_CREATE )
-		else:
-			raise
-	finally:
-		if 'overlay' in locals() and not overlay.closed:
-			# This is important 'cause it unblocks remaining ebuild creation
-			# jobs/threads, specifically waiting EbuildJobChannels in depres.
-			# It also writes the deps_unresolved file
-			overlay.close()
-# --- end of run_overlay_create() ---
-
-# -- run
-
-# always run sync 'cause commands = {create,sync} and create implies (no)sync
-run_sync()
-
-if 'create' in actions: run_overlay_create()
-
-if len ( actions ) > len ( actions_done ):
-	die (
-		"Some actions (out of %r) could not be performed!" % actions,
-		DIE.CMD_LEFTOVER
-	)

diff --git a/main.py b/main.py
new file mode 120000
index 0000000..34b2545
--- /dev/null
+++ b/main.py
@@ -0,0 +1 @@
+roverlay.py
\ No newline at end of file

diff --git a/main.py b/roverlay.py
similarity index 100%
copy from main.py
copy to roverlay.py