diff --git a/sdk_container/src/third_party/portage-stable/eclass/vcs-snapshot.eclass b/sdk_container/src/third_party/portage-stable/eclass/vcs-snapshot.eclass
index 0279e89ec3..998fe348a2 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/vcs-snapshot.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/vcs-snapshot.eclass
@@ -47,7 +47,7 @@ case ${EAPI} in
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_VCS_SNAPSHOT_ECLASS} ]]; then
+if [[ -z ${_VCS_SNAPSHOT_ECLASS} ]]; then
 _VCS_SNAPSHOT_ECLASS=1
 
 # @FUNCTION: vcs-snapshot_src_unpack
@@ -57,7 +57,7 @@ _VCS_SNAPSHOT_ECLASS=1
 # local names. Other archive types will be passed down to regular
 # unpack.
 vcs-snapshot_src_unpack() {
-	debug-print-function ${FUNCNAME} "${@}"
+	debug-print-function ${FUNCNAME} "$@"
 
 	local renamed_any=
 	local f