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

(-)a/branches/ucs-3.0/ucs/base/univention-debmirror/77univention-debmirror.inst (-4 / +4 lines)
 Lines 40-48   eval "$(univention-config-registry shell)" Link Here 
40 

          40
          

        

        

          41
          
if [ -n "$local_repository" ] && [ "$local_repository" = "true" -o "$local_repository" = "True" -o "$local_repository" = "yes" ]; then

          41
          
if [ -n "$local_repository" ] && [ "$local_repository" = "true" -o "$local_repository" = "True" -o "$local_repository" = "yes" ]; then

        

        

          42
          
	# Is there already another repository server?

          42
          
	# Is there already another repository server?

        

          
            

              43
              
	target="$(LC_ALL=C host -t CNAME univention-repository.$domainname | sed -ne 's|.* is an alias for ||p' | sed -e 's|\.$||')"


              43
              
	target="$(LC_ALL=C host -t "CNAME univention-repository.$domainname" | sed -ne 's|.* is an alias for ||p' | sed -e 's|\.$||')"

            

        

          44
          
	if [ -z "$target" ]; then

          44
          
	if [ -z "$target" ]; then

        

          
            

              45
              
		target="$(LC_ALL=C host univention-repository.$domainname | sed -ne 's|.* has \(IPv6 \)\?address ||p')"


              45
              
		target="$(LC_ALL=C host "univention-repository.$domainname" | sed -ne 's|.* has \(IPv6 \)\?address ||p')"

            

        

          46
          
	fi

          46
          
	fi

        

        

          47
          

          47
          

        

        

          48
          
	if [ -n "$target" ]; then

          48
          
	if [ -n "$target" ]; then

        

  

    

    

       Lines 50-60
      if [ -n "$local_repository" ] && [ "$local_repository" = "true" -o "$local_repos 
    
  Link Here 
    

  

        

          50
          
			# univention-repository is a alias for this host

          50
          
			# univention-repository is a alias for this host

        

        

          51
          
			true ;

          51
          
			true ;

        

        

          52
          
		else

          52
          
		else

        

          
            

              53
              
			univention-config-registry set repository/mirror/server=univention-repository.$domainname


              53
              
			univention-config-registry set repository/mirror/server="univention-repository.$domainname"

            

        

          54
          
		fi

          54
          
		fi

        

        

          55
          
	else

          55
          
	else

        

        

          56
          
		univention-config-registry set repository/mirror/server=updates.software-univention.de

          56
          
		univention-config-registry set repository/mirror/server=updates.software-univention.de

        

          
            

              57
              
		/usr/share/univention-directory-manager-tools/univention-dnsedit "$@" --ignore-exists --stoptls $domainname add cname univention-repository $hostname


              57
              
		/usr/share/univention-directory-manager-tools/univention-dnsedit "$@" --ignore-exists --stoptls "$domainname" add cname univention-repository "$hostname"

            

        

          58
          
	fi

          58
          
	fi

        

        

          59
          

          59
          

        

        

          60
          
	ucs_addServiceToLocalhost "Repository-Server" "$@" 

          60
          
	ucs_addServiceToLocalhost "Repository-Server" "$@" 

        



(-)a/branches/ucs-3.0/ucs/base/univention-updater/python/univention-repository-update
      (-2 / +4 lines)




  

    

    

       Lines 58-64
      _repo_base = os.path.join( _mirror_base, 'mirror', configRegistry.get( 'version/ 
    
  Link Here 
    

  

        

          58
          

          58
          

        

        

          59
          
def copy_repository( options, source, version ):

          59
          
def copy_repository( options, source, version ):

        

        

          60
          
	""" Copy packages and scripts belonging to version from source directory into local repository """

          60
          
	""" Copy packages and scripts belonging to version from source directory into local repository """

        

          
            

              61
              
	print >>options.teefile, 'Copying packages. Please be patient ...',


              61
              
	print >>options.teefile, 'Please be patient, copying packages ...',

            

        

          62
          
	sys.stdout.flush()

          62
          
	sys.stdout.flush()

        

        

          63
          

          63
          

        

        

          64
          
	version = _exp_version.match( version ).groupdict()

          64
          
	version = _exp_version.match( version ).groupdict()

        

  

    

    

       Lines 76-87
      def copy_repository( options, source, version ): 
    
  Link Here 
    

  

        

          76
          
	urepo.copy_package_files( source, dest_repo )

          76
          
	urepo.copy_package_files( source, dest_repo )

        

        

          77
          

          77
          

        

        

          78
          
	# create Packages files

          78
          
	# create Packages files

        

            

              
              
              79
              
	print >>options.teefile, 'Packages ...',

            

        

          79
          
	urepo.update_indexes( dest_repo )

          80
          
	urepo.update_indexes( dest_repo )

        

        

          80
          

          81
          

        

            

              
              
              82
              
	print >>options.teefile, 'Scripts ...',

            

        

          81
          
	for script in ('preup.sh', 'postup.sh'):

          83
          
	for script in ('preup.sh', 'postup.sh'):

        

        

          82
          
		if os.path.exists(os.path.join(source, script)):

          84
          
		if os.path.exists(os.path.join(source, script)):

        

        

          83
          
			shutil.copy2(os.path.join(source, script), os.path.join(dest_repo, 'all', script))

          85
          
			shutil.copy2(os.path.join(source, script), os.path.join(dest_repo, 'all', script))

        

          
            

              84
              
	print >>sys.stdout


              86
              
	print >>options.teefile, 'Done.'

            

        

          85
          

          87
          

        

        

          86
          
def update_cdrom( options ):

          88
          
def update_cdrom( options ):

        

        

          87
          
	""" Copy repository from local DVD or ISO image """

          89
          
	""" Copy repository from local DVD or ISO image """

        






  

  Return to bug 25495