dnf/yum: install/remove current arch packages

bin/epm-install

@@ -144,10 +144,10 @@ epm_install_names()
 			sudocmd aura -A $force $nodeps $@
 			return ;;
 		yum-rpm)
-			sudocmd yum $YUMOPTIONS install $@
+			sudocmd yum $YUMOPTIONS install $(echo "$*" | exp_with_arch_suffix)
 			return ;;
 		dnf-rpm)
-			sudocmd dnf install $@
+			sudocmd dnf install $(echo "$*" | exp_with_arch_suffix)
 			return ;;
 		snappy)
 			sudocmd snappy install $@
@@ -217,10 +217,10 @@ epm_ni_install_names()
 			sudocmd aptitude -y install $@
 			return ;;
 		yum-rpm)
-			sudocmd yum -y $YUMOPTIONS install $@
+			sudocmd yum -y $YUMOPTIONS install $(echo "$*" | exp_with_arch_suffix)
 			return ;;
 		dnf-rpm)
-			sudocmd dnf -y $YUMOPTIONS install $@
+			sudocmd dnf -y $YUMOPTIONS install $(echo "$*" | exp_with_arch_suffix)
 			return ;;
 		urpm-rpm)
 			sudocmd urpmi --auto $URPMOPTIONS $@

bin/epm-remove

@@ -256,8 +256,8 @@ epm_remove()
 	pkg_files=''
 
 	[ -n "$pkg_names" ] || fatal "Remove: missing package(s) name."
-	# TODO: remove only according current arch (if x86_64)
-	#pkg_names="$(echo $pkg_names | exp_with_arch_suffix)"
+	# remove according current arch (if x86_64) by default
+	pkg_names="$(echo $pkg_names | exp_with_arch_suffix)"
 
 	if [ -n "$dryrun" ] ; then
 		info "Packages for removing:"