View | Details | Raw Unified | Return to bug 29759 | Differences between
and this patch

Collapse All | Expand All

(-)umc/python/setup/setup_script.py (-2 / +5 lines)
 Lines 361-369    Link Here 
361 
	def reopen_cache(self):
 361 
	def reopen_cache(self):
362 
		self.package_manager.reopen_cache()
 362 
		self.package_manager.reopen_cache()
363 

          363
          

        

            

              
              
              364
              
	def mark_auto(self, auto, *pkgs):

            

            

              365
              
		self.package_manager.mark_auto(auto, *pkgs)

            

            

              366
              

            

        

          364
          
	def commit(self, install=None, remove=None, msg_if_failed=''):

          367
          
	def commit(self, install=None, remove=None, msg_if_failed=''):

        

        

          365
          
		with self.noninteractive():

          368
          
		with self.noninteractive():

        

          
            

              366
              
			self.package_manager.commit(install, remove, msg_if_failed)


              369
              
			self.package_manager.commit(install, remove, msg_if_failed=msg_if_failed)

            

        

          367
          

          370
          

        

        

          368
          
	def install(self, *pkg_names):

          371
          
	def install(self, *pkg_names):

        

        

          369
          
		with self.noninteractive():

          372
          
		with self.noninteractive():

        

  

    

    

       Lines 383-389
       
    
  Link Here 
    

  

        

          383
          
			return self.package_manager.cache[pkg_name]

          386
          
			return self.package_manager.cache[pkg_name]

        

        

          384
          
		except KeyError:

          387
          
		except KeyError:

        

        

          385
          
			self.error(_('Failed to get package for Role %s') % role_name)

          388
          
			self.error(_('Failed to get package for Role %s') % role_name)

        

          
            

              386
              
			return False


              389
              
			return None

            

        

          387
          

          390
          

        

        

          388
          
	def autoremove(self):

          391
          
	def autoremove(self):

        

        

          389
          
		with self.noninteractive():

          392
          
		with self.noninteractive():

        



(-)umc/js/setup/LanguagePage.js
      (-1 / +1 lines)




  

    

    

       Lines 126-132
       
    
  Link Here 
    

  

        

          126
          
					return this._localesDeferred.then(function(locales) {

          126
          
					return this._localesDeferred.then(function(locales) {

        

        

          127
          
						return array.map(ids, function(id) {

          127
          
						return array.map(ids, function(id) {

        

        

          128
          
							if (typeof id == "string") {

          128
          
							if (typeof id == "string") {

        

          
            

              129
              
								return { id: id, label :locales[id] };


              129
              
								return { id: id, label: locales[id] };

            

        

          130
          
							}

          130
          
							}

        

        

          131
          
							return id;

          131
          
							return id;

        

        

          132
          
						});

          132
          
						});

        



(-)umc/js/setup/SystemRolePage.js
      (-2 / +1 lines)




  

    

    

       Lines 73-80
       
    
  Link Here 
    

  

        

          73
          
					{ id: 'domaincontroller_master', label: _('Domain controller master') },

          73
          
					{ id: 'domaincontroller_master', label: _('Domain controller master') },

        

        

          74
          
					{ id: 'domaincontroller_backup', label: _('Domain controller backup') },

          74
          
					{ id: 'domaincontroller_backup', label: _('Domain controller backup') },

        

        

          75
          
					{ id: 'domaincontroller_slave', label: _('Domain controller slave') },

          75
          
					{ id: 'domaincontroller_slave', label: _('Domain controller slave') },

        

          
            

              76
              
					// Disable memberserver selection: Bug #29757


              76
              
					{ id: 'memberserver', label: _('Member server') }

            

            

              77
              
					// { id: 'memberserver', label: _('Member server') }


              
              
            

        

          78
          
					// { id: 'basesystem', label: _('Base system') }

          77
          
					// { id: 'basesystem', label: _('Base system') }

        

        

          79
          
 				]

          78
          
 				]

        

        

          80
          
			}, {

          79
          
			}, {

        



(-)usr/lib/univention-system-setup/scripts/role/10role
      (-7 / +4 lines)




  

    

    

       Lines 30-40
       
    
  Link Here 
    

  

        

          30
          
# License with the Debian GNU/Linux or Univention distribution in file

          30
          
# License with the Debian GNU/Linux or Univention distribution in file

        

        

          31
          
# /usr/share/common-licenses/AGPL-3; if not, see

          31
          
# /usr/share/common-licenses/AGPL-3; if not, see

        

        

          32
          
# <http://www.gnu.org/licenses/>.

          32
          
# <http://www.gnu.org/licenses/>.

        

            

              33
              
import sys

              
              
            

        

          34
          
import os.path

          33
          
import os.path

        

        

          35
          
import shutil

          34
          
import shutil

        

        

          36
          
import glob

          35
          
import glob

        

            

              37
              
import apt_pkg

              
              
            

        

          38
          

          36
          

        

        

          39
          
from univention.management.console.modules.setup.setup_script import AptScript, main, _

          37
          
from univention.management.console.modules.setup.setup_script import AptScript, main, _

        

        

          40
          

          38
          

        

  

    

    

       Lines 90-103
       
    
  Link Here 
    

  

        

          90
          
		self.finish_task()

          88
          
		self.finish_task()

        

        

          91
          

          89
          

        

        

          92
          
		if current_server_role_package:

          90
          
		if current_server_role_package:

        

          
            

              93
              
			self.commit(install=[wanted_server_role_package], remove=[current_server_role_package])


              91
              
			self.uninstall(current_server_role_package)

            

            

              94
              
		else:


              92
              
		self.install(wanted_server_role_package)

            

            

              95
              
			self.commit(install=[wanted_server_role_package])


              
              
            

        

          96
          

          93
          

        

        

          97
          
		self.finish_task()

          94
          
		self.finish_task()

        

        

          98
          

          95
          

        

        

          99
          
		# mark these packages as manually installed

          96
          
		# mark these packages as manually installed

        

          
            

              100
              
		self.install('univention-pam', 'univention-management-console')


              97
              
		self.mark_auto(False, 'univention-pam', 'univention-management-console')

            

            

              
              

              98
              
		self.reopen_cache()

            

        

          101
          

          99
          

        

        

          102
          
		# apt-get autoremove

          100
          
		# apt-get autoremove

        

        

          103
          
		self.autoremove()

          101
          
		self.autoremove()

        

  

    

    

       Lines 106-112
       
    
  Link Here 
    

  

        

          106
          
			# reinstall listener on memberserver because the ldap-server package

          104
          
			# reinstall listener on memberserver because the ldap-server package

        

        

          107
          
			# will remove too much:

          105
          
			# will remove too much:

        

        

          108
          
			# https://forge.univention.org/bugzilla/show_bug.cgi?id=26269

          106
          
			# https://forge.univention.org/bugzilla/show_bug.cgi?id=26269

        

            

              109
              
			apt_pkg.config['APT::Get::ReInstall'] = 'true'

              
              
            

        

          110
          
			self.install('univention-directory-listener')

          107
          
			self.install('univention-directory-listener')

        

        

          111
          

          108
          

        

        

          112
          
		self.finish_task()

          109
          
		self.finish_task()

        






  

  Return to bug 29759