View | Details | Raw Unified | Return to bug 32817
Collapse All | Expand All

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/umc/python/setup/util.py (-5 / +8 lines)
 Lines 133-139   def load_values(): Link Here 
133
def _xkeymap(keymap):
133
def _xkeymap(keymap):
134
	'''Determine the x-keymap which belongs to 'keymap' by
134
	'''Determine the x-keymap which belongs to 'keymap' by
135
	parsing /lib/univention-installer/locale/all-kmaps'''
135
	parsing /lib/univention-installer/locale/all-kmaps'''
136
	
136
137
	xkeymap = {'layout' : '', 'variant' : ''}
137
	xkeymap = {'layout' : '', 'variant' : ''}
138
	fp = open('/lib/univention-installer/locale/all-kmaps', 'r')
138
	fp = open('/lib/univention-installer/locale/all-kmaps', 'r')
139
	for line in fp:
139
	for line in fp:
 Lines 368-376   def run_scripts( progressParser, restartServer = False ): Link Here 
368
	subprocess.call( CMD_DISABLE_EXEC, stdout = f, stderr = f )
368
	subprocess.call( CMD_DISABLE_EXEC, stdout = f, stderr = f )
369
369
370
	for scriptpath in sorted_files_in_subdirs( PATH_SETUP_SCRIPTS ):
370
	for scriptpath in sorted_files_in_subdirs( PATH_SETUP_SCRIPTS ):
371
			# launch script
371
		# launch script
372
			MODULE.info('Running script %s\n' % scriptpath)
372
		try:
373
			p = subprocess.Popen( scriptpath, stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
373
			p = subprocess.Popen( scriptpath, stdout = subprocess.PIPE, stderr = subprocess.STDOUT )
374
			MODULE.info("Running script '%s': pid=%d" % (scriptpath, p.pid))
375
		except OSError, ex:
376
			MODULE.info("Failed to run '%s': %s" % (scriptpath, ex))
377
		else:
374
			for line in p.stdout:
378
			for line in p.stdout:
375
				progressParser.parse( line )
379
				progressParser.parse( line )
376
				f.write( line )
380
				f.write( line )
 Lines 579-585   def get_components(role=None): Link Here 
579
583
580
	# reload for correct locale
584
	# reload for correct locale
581
	imp.reload(package_list)
585
	imp.reload(package_list)
582
	pkglist = [ jpackage for icategory in package_list.PackageList 
586
	pkglist = [ jpackage for icategory in package_list.PackageList
583
			for jpackage in icategory['Packages']
587
			for jpackage in icategory['Packages']
584
			if 'all' in jpackage['Possible'] or role in jpackage['Possible'] ]
588
			if 'all' in jpackage['Possible'] or role in jpackage['Possible'] ]
585
589
586
- 

Return to bug 32817