Attachment #349180 for bug #231482




                         ' when creating virtual files. <NOTE>: some pack'
                         'ages will not work if you use this option')

        group.add_option('--copy',
                         '--copy',
                         action='store_true',
                         help = 'Directly copy the webapp files from'
             ' the /usr/share/webapps/ directory when installing'


            self.config.set('USER', 'g_link_type', 'soft')

        elif ((self.config.has_option('USER', 'vhost_link_type') and
               self.config.get('USER', 'vhost_link_type') == 'copy') or
              (self.config.has_option('USER', 'g_copy') and
               self.config.getboolean('USER', 'g_copy'))):

            OUT.debug('Selecting copying of links', 7)

            self.config.set('USER', 'g_link_type', 'copy')

        else:


                 'upgrade'  : self.upgrading(),
                 'verbose'  : self.verbose(),
                 'pretend'  : self.pretend()}

        return allowed_servers[server](directories,
                                       self.create_permissions(),
                                       handlers,

Lines 280-286 class WebappAdd: Link Here

(-)a/WebappConfig/worker.py (-3 / +2 lines)
280	self.__content = handler['content']	280	self.__content = handler['content']
281	self.__remove = handler['removal']	281	self.__remove = handler['removal']
282	self.__protect = handler['protect']	282	self.__protect = handler['protect']
283	self.__link_type = flags['linktype']	283	self.__link_type = flags['linktype']
284	self.__relative = flags['relative']	284	self.__relative = flags['relative']
285	self.__u = flags['upgrade']	285	self.__u = flags['upgrade']
286	self.__v = flags['verbose']	286	self.__v = flags['verbose']
Lines 508-514 class WebappAdd: Link Here
508	if self.__v:	508	if self.__v:
509	OUT.warn('Failed to softlink (' + str(e) + ')')	509	OUT.warn('Failed to softlink (' + str(e) + ')')
510		510
511	elif self.__link_type == 'clone':	511	elif self.__link_type == 'copy':
512	try:	512	try:
513		513
514	OUT.debug('Trying to copy files directly', 8)	514	OUT.debug('Trying to copy files directly', 8)
515	-

Return to bug 231482

Lines 490-497 class Config: Link Here

(-)a/WebappConfig/config.py (-6 / +6 lines)
490	' when creating virtual files. <NOTE>: some pack'	490	' when creating virtual files. <NOTE>: some pack'
491	'ages will not work if you use this option')	491	'ages will not work if you use this option')
492		492
493	group.add_option('--cp',	493	group.add_option('--copy',
494	'--copy',
495	action='store_true',	494	action='store_true',
496	help = 'Directly copy the webapp files from'	495	help = 'Directly copy the webapp files from'
497	' the /usr/share/webapps/ directory when installing'	496	' the /usr/share/webapps/ directory when installing'
Lines 999-1010 class Config: Link Here
999		998
1000	self.config.set('USER', 'g_link_type', 'soft')	999	self.config.set('USER', 'g_link_type', 'soft')
1001		1000
1002	elif (self.config.has_option('USER', 'g_copy') and	1001	elif ((self.config.has_option('USER', 'vhost_link_type') and
1003	self.config.getboolean('USER', 'g_copy')):	1002	self.config.get('USER', 'vhost_link_type') == 'copy') or
		1003	(self.config.has_option('USER', 'g_copy') and
		1004	self.config.getboolean('USER', 'g_copy'))):
1004		1005
1005	OUT.debug('Selecting copying of links', 7)	1006	OUT.debug('Selecting copying of links', 7)
1006		1007
1007	self.config.set('USER', 'g_link_type', 'clone')	1008	self.config.set('USER', 'g_link_type', 'copy')
1008		1009
1009	else:	1010	else:
1010		1011
Lines 1488-1494 class Config: Link Here
1488	'upgrade' : self.upgrading(),	1489	'upgrade' : self.upgrading(),
1489	'verbose' : self.verbose(),	1490	'verbose' : self.verbose(),
1490	'pretend' : self.pretend()}	1491	'pretend' : self.pretend()}
1491
1492	return allowed_servers[server](directories,	1492	return allowed_servers[server](directories,
1493	self.create_permissions(),	1493	self.create_permissions(),
1494	handlers,	1494	handlers,