backported to M60P as 1.1.4-alt0.M60P.1 (with rpmbph script)

bin/epm-autoclean → bin/epm-autoremove

@@ -17,7 +17,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-epm_autoclean()
+epm_autoremove()
 {
 case $PMTYPE in
 	#apt-rpm)

bin/epm-checkpkg

@@ -19,18 +19,18 @@
 
 check_rpm_integrity()
 {
-	a= rpm --checksig $@ >/dev/null
+	docmd rpm --checksig $@
 }
 
 check_deb_integrity()
 {
 	# FIXME: debsums -ca package ?
-	a= dpkg --contents $@ >/dev/null
+	docmd dpkg --contents $@
 }
 
 check_bz2_integrity()
 {
-	a= bunzip -t $1 >/dev/null
+	docmd bunzip -t $1
 }
 
 check_tbz_integrity()
@@ -40,7 +40,7 @@ check_tbz_integrity()
 
 check_gz_integrity()
 {
-	a= gunzip -t $1 >/dev/null
+	docmd gunzip -t $1
 }
 
 check_tgz_integrity()
@@ -50,12 +50,22 @@ check_tgz_integrity()
 
 check_zip_integrity()
 {
-	a= unzip -t $1 >/dev/null
+	docmd unzip -t $@
+}
+
+check_rar_integrity()
+{
+	docmd unrar t $@
 }
 
 check_xz_integrity()
 {
-	a= xz -t $1 >/dev/null
+	docmd xz -t $1
+}
+
+check_7z_integrity()
+{
+	docmd 7z t $1
 }
 
 check_exe_integrity()

bin/epm-install

@@ -57,6 +57,9 @@ epm_install_names()
 		apt-rpm|apt-dpkg)
 			sudocmd apt-get install $@
 			return ;;
+		deepsolver-rpm)
+			sudocmd ds-install $@
+			return ;;
 		urpm-rpm)
 			sudocmd urpmi $@
 			return ;;

bin/epm-remove

@@ -49,6 +49,9 @@ epm_remove_names()
 		apt-rpm|apt-dpkg)
 			sudocmd apt-get remove --purge $@
 			return ;;
+		deepsolver-rpm)
+			sudocmd ds-remove $@
+			return ;;
 		urpm-rpm)
 			sudocmd urpme $@
 			return ;;

bin/epm-repolist

@@ -34,6 +34,9 @@ case $PMTYPE in
 	apt-rpm)
 		docmd apt-repo list
 		;;
+	deepsolver-rpm)
+		docmd ds-conf
+		;;
 	apt-dpkg)
 		showcmd cat /etc/apt/sources.list*
 		print_apt_sources_list /etc/apt/sources.list /etc/apt/sources.list.d/*.list

bin/epm-sh-functions

@@ -180,9 +180,19 @@ set_pm_type()
 	[ -n "$DISTRVERSION" ] || DISTRVERSION=$($DISTRVENDOR -v)
 	set_target_pkg_env
 
+# override package manager detection result
+if [ -n "$FORCEPM" ] ; then
+	PMTYPE=$FORCEPM
+	return
+fi
+
 case $DISTRNAME in
 	ALTLinux|PCLinux)
 		CMD="apt-rpm"
+		#which deepsolver 2>/dev/null >/dev/null && CMD=deepsolver-rpm
+		;;
+	PCLinux)
+		CMD="apt-rpm"
 		;;
 	Ubuntu|Debian|Mint)
 		CMD="apt-dpkg"

bin/epm-update

@@ -49,6 +49,9 @@ case $PMTYPE in
 	slackpkg)
 		sudocmd /usr/sbin/slackpkg update
 		;;
+	deepsolver-rpm)
+		sudocmd ds-update
+		;;
 	*)
 		fatal "Do not known update command for $PMTYPE"
 		;;

eepm.spec

 # This spec is backported to ALTLinux p6 automatically by rpmbph script. Do not edit it.
 #
 Name: eepm
-Version: 1.1.2
+Version: 1.1.4
 Release: alt0.M60P.1
 
 Summary: Etersoft EPM package manager
@@ -60,9 +60,16 @@ install -m 0644 bash_completion/serv %buildroot%_sysconfdir/bash_completion.d/se
 %_sysconfdir/bash_completion.d/serv
 
 %changelog
-* Thu Dec 13 2012 Vitaly Lipatov <lav@altlinux.ru> 1.1.2-alt0.M60P.1
+* Tue Jan 01 2013 Vitaly Lipatov <lav@altlinux.ru> 1.1.4-alt0.M60P.1
 - backport to ALTLinux p6 (by rpmbph script)
 
+* Tue Jan 01 2013 Vitaly Lipatov <lav@altlinux.ru> 1.1.4-alt1
+- fix broken autoremove: rename epm-autoclean to epm-autoremove
+
+* Thu Dec 27 2012 Vitaly Lipatov <lav@altlinux.ru> 1.1.3-alt1
+- add initial deepsolver support
+- checkpkg: print checking details, add 7z and rar support
+
 * Thu Dec 13 2012 Vitaly Lipatov <lav@altlinux.ru> 1.1.2-alt1
 - serv: allow additional params for start, stop and try_restart
 - spec: replace @VERSION@ in serv too