[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#260626: base-config: proposed fix for adding a trailing slash to the HTTP proxy value, in apt-setup



tags 260626 patch
thanks

The attached patch adds a trailing slash to the proxy setting in
mirror/http/proxy in case it's missing (choose-mirror allows this but
not apt-setup).




-- 


*** apt-setup.255651	2004-10-15 21:54:33.000000000 +0200
--- apt-setup.255651+260626	2004-10-15 22:17:15.000000000 +0200
***************
*** 399,404 ****
--- 399,408 ----
  			   ! grep -iq 'Acquire::http::Proxy' $APTETC/apt.conf; then
  				ask_q high mirror/http/proxy || true
  				db_go || continue
+ 				# Add a trailing slash if missing
+ 				db_get mirror/http/proxy || true
+ 				http_proxy=$(echo $RET|sed 's/[\/]*$/\//')
+ 				db_set mirror/http/proxy $http_proxy || true 
  			fi
  		fi
  	;;
***************
*** 644,649 ****
--- 648,657 ----
  			   ! grep -iq 'Acquire::http::Proxy' $APTETC/apt.conf; then
  				db_input high mirror/http/proxy || true
  				db_go || continue
+ 				# Add a trailing slash if missing
+ 				db_get mirror/http/proxy || true
+ 				http_proxy=$(echo $RET|sed 's/[\/]*$/\//')
+ 				db_set mirror/http/proxy $http_proxy || true 
  			fi
  		fi
  		# Test it.

Reply to: