Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 10872 | Differences between
and this patch

Collapse All | Expand All

(-)/var/portage/eclass/cvs.eclass (-3 / +3 lines)
Lines 285-297 Link Here
285
	
285
	
286
	if [ -n "$ECVS_SUBDIR" ]; then
286
	if [ -n "$ECVS_SUBDIR" ]; then
287
		if [ -n "$ECVS_LOCAL" ]; then
287
		if [ -n "$ECVS_LOCAL" ]; then
288
			cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR/*" "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
288
			cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR/"* "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
289
		else
289
		else
290
			cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR" "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/.."
290
			cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR" "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/.."
291
		fi    
291
		fi    
292
	else
292
	else
293
		if [ -n "$ECVS_LOCAL" ]; then
293
		if [ -n "$ECVS_LOCAL" ]; then
294
			cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/*" "$WORKDIR/$ECVS_MODULE"
294
			cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/"* "$WORKDIR/$ECVS_MODULE"
295
		else
295
		else
296
			cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE" "$WORKDIR"
296
			cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE" "$WORKDIR"
297
		fi
297
		fi
Lines 300-306 Link Here
300
	# if the directory is empty, remove it; empty directories cannot exist in cvs.
300
	# if the directory is empty, remove it; empty directories cannot exist in cvs.
301
	# this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
301
	# this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
302
	# still create the empty directory in workdir though.
302
	# still create the empty directory in workdir though.
303
	if [ "`ls -A $DIR`" == "CVS" ]; then
303
	if [ "`ls -A \"$DIR\"`" == "CVS" ]; then
304
		debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR"
304
		debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR"
305
		rm -rf "$DIR"
305
		rm -rf "$DIR"
306
	fi
306
	fi

Return to bug 10872