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

Bug#260626: base-config: Proxy use fails when user forgets adding a trailing "/" in the proxy information



I added some quoting in the patch and made some cosmetic changes in the 
statement: http_proxy="$(echo $RET | sed 's/[/]*$/\//')"

I tested this statement in d-i's ash and it seems to work fine.

Cheers,
FJP
*** 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: