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

(-)univention-lib/python/ldap_extension.py (-2 / +2 lines)
 Lines 211-218    Link Here 
211 
			if registered_package == options.packagename:
 211 
			if registered_package == options.packagename:
212 
				rc = apt.apt_pkg.version_compare(options.packageversion, registered_package_version)
 212 
				rc = apt.apt_pkg.version_compare(options.packageversion, registered_package_version)
213 
				if not rc > -1:
 213 
				if not rc > -1:
214 
					print >>sys.stderr, "ERROR: Registered package version %s is newer, refusing registration." % (registered_package_version,)
 214 
					print >>sys.stderr, "WARNING: Registered package version %s is newer, refusing registration." % (registered_package_version,)
215 
					sys.exit(1)
 215 
					sys.exit(2)
216 
			else:
 216 
			else:
217 
				print >>sys.stderr, "WARNING: Object %s was registered by package %s version %s, changing ownership." % (self.objectname, registered_package, registered_package_version,)
 217 
				print >>sys.stderr, "WARNING: Object %s was registered by package %s version %s, changing ownership." % (self.objectname, registered_package, registered_package_version,)
218 

          218
          

        



(-)univention-lib/shell/ldap.sh
      (+12 lines)




  

    

    

       Lines 327-332
       
    
  Link Here 
    

  

        

          327
          
	PYTHONPATH="/usr/lib/pymodules/$(pyversions -d)/univention/lib" \

          327
          
	PYTHONPATH="/usr/lib/pymodules/$(pyversions -d)/univention/lib" \

        

        

          328
          
		python -c 'import ldap_extension; ldap_extension.ucs_registerLDAPExtension()' \

          328
          
		python -c 'import ldap_extension; ldap_extension.ucs_registerLDAPExtension()' \

        

        

          329
          
			--packagename "$package_name" --packageversion "$package_version" "$@"

          329
          
			--packagename "$package_name" --packageversion "$package_version" "$@"

        

            

              
              
              330
              
	rc="$?"

            

            

              331
              
	if [ "$rc" = 2 ]; then

            

            

              332
              
		echo "WARNING: ucs_registerLDAPExtension returned $rc, continuing anyway."

            

            

              333
              
		rc=0

            

            

              334
              
	fi

            

            

              335
              
	return "$rc"

            

        

          330
          
}

          336
          
}

        

        

          331
          

          337
          

        

        

          332
          
# ucs_unregisterLDAPExtension removes an LDAP schema or ACL extension from UDM.

          338
          
# ucs_unregisterLDAPExtension removes an LDAP schema or ACL extension from UDM.

        

  

    

    

       Lines 338-343
       
    
  Link Here 
    

  

        

          338
          
ucs_unregisterLDAPExtension () {

          344
          
ucs_unregisterLDAPExtension () {

        

        

          339
          
	PYTHONPATH="/usr/lib/pymodules/$(pyversions -d)/univention/lib" \

          345
          
	PYTHONPATH="/usr/lib/pymodules/$(pyversions -d)/univention/lib" \

        

        

          340
          
		python -c 'import ldap_extension; ldap_extension.ucs_unregisterLDAPExtension()' "$@"

          346
          
		python -c 'import ldap_extension; ldap_extension.ucs_unregisterLDAPExtension()' "$@"

        

            

              
              
              347
              
	rc="$?"

            

            

              348
              
	if [ "$rc" = 2 ]; then

            

            

              349
              
		echo "WARNING: ucs_unregisterLDAPExtension returned $rc, continuing anyway."

            

            

              350
              
		rc=0

            

            

              351
              
	fi

            

            

              352
              
	return "$rc"

            

        

          341
          
}

          353
          
}

        

        

          342
          

          354
          

        

        

          343
          

          355
          

        






  

  Return to bug 33582