From 68f8b94e2a287c970e2d92a8b51842c155bf51eb Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Wed, 22 Jan 2014 17:29:15 +0100
Subject: [PATCH] Drop --remote-user configuration option again.

* as Ingo has pointed out, the remote user settings doesn't
  relate to the build configuration at all, so setting the
  remote user via HAIKU_REMOTE_USER in UserBuildConfig or
  via shell environment is the way to go
* additionally: drop debug output
---
 build/jam/RepositoryRules | 1 -
 configure                 | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index b9370f101d..375e6ce7eb 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -644,7 +644,6 @@ actions UploadPackages1
 	if [ -n "$remoteUser" ]; then
 		remote="$remoteUser@$remote"
 	fi
-	echo $remote
 
 	if [ -n "$(HAIKU_REMOTE_REPOSITORY_PACKAGES:E=:J)" ]; then
 		for package in $(HAIKU_REMOTE_REPOSITORY_PACKAGES) ; do
diff --git a/configure b/configure
index b8a2ac9fb8..9a424cd383 100755
--- a/configure
+++ b/configure
@@ -485,7 +485,6 @@ HOST_SHA256=
 HOST_HAIKU_PORTER=
 HAIKU_PORTS=
 HAIKU_PORTS_CROSS=
-HAIKU_REMOTE_USER=
 
 HAIKU_PACKAGING_ARCHS=
 
@@ -613,11 +612,6 @@ while [ $# -gt 0 ] ; do
 		--include-sources)	HAIKU_INCLUDE_SOURCES=1; shift 1;;
 		--include-3rdparty)	HAIKU_INCLUDE_3RDPARTY=1; shift 1;;
         -j*)				buildCrossToolsJobs="$1"; shift 1;;
-		--remote-user)
-			assertparam "$1" $#
-			HAIKU_REMOTE_USER=$2
-			shift 2
-			;;
 		--target=*)     TARGET_PLATFORM=`echo $1 | cut -d'=' -f2-`; shift 1;;
 		--target-arch)
 			assertparam "$1" $#
@@ -895,8 +889,6 @@ HOST_HAIKU_PORTER			?= ${HOST_HAIKU_PORTER} ;
 HAIKU_PORTS					?= ${HAIKU_PORTS} ;
 HAIKU_PORTS_CROSS			?= ${HAIKU_PORTS_CROSS} ;
 
-HAIKU_REMOTE_USER			?= "${HAIKU_REMOTE_USER}" ;
-
 EOF
 
 for targetArch in $HAIKU_PACKAGING_ARCHS; do