Merge git.eter:/projects/korinf/eepm

bin/epm

@@ -145,6 +145,12 @@ check_command()
     addrepo)              # HELPCMD: add package repo
         epm_cmd=addrepo
         ;;
+    repolist|sl)          # HELPCMD: print repo list
+        epm_cmd=repolist
+        ;;
+    removerepo|rr)        # HELPCMD: remove package repo
+        epm_cmd=removerepo
+        ;;
     *)
         return 1
     esac

bin/epm-remove

@@ -63,15 +63,15 @@ epm_remove()
 epm_remove_names()
 {
 	[ -z "$1" ] && return
-#	[ -n "$pkg_filenames" ] || fatal "Run remove without names"
+
 	case $PMTYPE in
 		apt-rpm|apt-dpkg)
-			docmd apt-get remove --purge $@
+			docmd $SUDO apt-get remove --purge $@
 			return ;;
 		urpm-rpm)
 			docmd $SUDO urpme $@
 			return ;;
-		pkg_add) #without dependense
+		pkg_add) # without dependencies
 			docmd $SUDO pkg_delete $@
 			return ;;
 		emerge)
@@ -95,7 +95,7 @@ epm_remove_names()
 		*)
 			fatal "Do not known command for $PMTYPE"
 			;;
-esac
+	esac
 
 #docmd $SUDO $CMD $pkg_names $pkg_files
 

bin/epm-repolist

@@ -25,10 +25,10 @@ case $PMTYPE in
 	#	docmd $SUDO apt-get check || exit
 	#	;;
 	yum-rpm)
-		docmd $SUDO yum repolist || exit
+		docmd $SUDO yum repolist
 		;;
 	zypper-rpm)
-		docmd $USDO zypper sl
+		docmd $USDO zypper sl -d
 		;;
 	*)
 		fatal "Do not known command for $PMTYPE"

bin/epm-simulate

@@ -18,12 +18,17 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 
+load_helper epm-install
 
 epm_simulate()
 {
     local CMD
     [ -n "$pkg_filenames" ] || fatal "Run $epm_cmd without packages"
 
+    local filenames=$(echo $pkg_filenames | filter_out_installed_packages)
+    # FIXME: can't correct receive status 2 in mandriva?
+    [ -z "$filenames" ] && echo "Skip empty simulate list" && return 0 #&& return 2
+
     case $PMTYPE in
     	apt-rpm|apt-dpkg)
     		CMD="apt-get --simulate install"
@@ -41,8 +46,8 @@ epm_simulate()
     		echo "FIXME: Skip with emerge"
     		return ;;
     	pacman)
-    		showcmd $SUDO pacman -v -S $pkg_filenames
-    		echo no | $SUDO pacman -v -S $pkg_filenames
+    		showcmd $SUDO pacman -v -S $filenames
+    		echo no | $SUDO pacman -v -S $filenames
     		return ;;
     	pkgtool)
     		return 0 ;;
@@ -51,6 +56,6 @@ epm_simulate()
     		;;
     esac
 
-    docmd $SUDO $CMD $pkg_filenames
+    docmd $SUDO $CMD $filenames
 }
 

bin/epm-update

@@ -35,6 +35,9 @@ case $PMTYPE in
 	urpm-rpm)
 		docmd $SUDO urpmi.update -a
 		;;
+	pacman)
+		docmd $SUDO pacman -S -y
+		;;
 	zypper-rpm)
 		docmd $SUDO zypper refresh
 		;;

eepm.spec

 Name: eepm
-Version: 0.9
+Version: 0.9.1
 Release: alt1
 
 Summary: Etersoft EPM package manager
@@ -39,6 +39,11 @@ with various distros.
 %_bindir/distr_info
 
 %changelog
+* Sat Jul 28 2012 Vitaly Lipatov <lav@altlinux.ru> 0.9.1-alt1
+- epm-simulate: add support for --skip-installed
+- add more distr in epm -i, epm -e and add some bugs in epm -e
+- add initial Slackware support (pkgtool)
+
 * Fri Jul 27 2012 Vitaly Lipatov <lav@altlinux.ru> 0.9-alt1
 - epm: add --nodeps options recognize
 - add showcmd in addition to docmd