Commit 517cc14c authored by Vitaly Lipatov's avatar Vitaly Lipatov

backported to p8 as 1.9.0-alt0.M80P.1 (with rpmbph script)

parents a14f59c0 de9d2752
...@@ -60,7 +60,7 @@ case $PMTYPE in ...@@ -60,7 +60,7 @@ case $PMTYPE in
docmd epm remove $PKGLIST docmd epm remove $PKGLIST
;; ;;
urpm-rpm) urpm-rpm)
showcmd urpmq --auto-orphans showcmd urpme --report-orphans
sudocmd urpme --auto-orphans sudocmd urpme --auto-orphans
;; ;;
#emerge) #emerge)
......
...@@ -36,7 +36,7 @@ __epm_autoremove_altrpm() ...@@ -36,7 +36,7 @@ __epm_autoremove_altrpm()
| grep -E -v -- "-(devel|debuginfo)$" \ | grep -E -v -- "-(devel|debuginfo)$" \
| grep -E -v -- "-(util|tool|plugin|daemon)" \ | grep -E -v -- "-(util|tool|plugin|daemon)" \
| sed -e "s/\.32bit$//g" \ | sed -e "s/\.32bit$//g" \
| grep -E -v -- "^(libsystemd|libreoffice|libnss|eepm)" ) | grep -E -v -- "^(libsystemd|libreoffice|libnss|libvirt-client|libvirt-daemon|eepm)" )
[ -n "$pkgs" ] && sudocmd rpm -v -e $pkgs && flag=1 [ -n "$pkgs" ] && sudocmd rpm -v -e $pkgs && flag=1
info "Removing unused python/perl modules..." info "Removing unused python/perl modules..."
......
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2012 Etersoft # Copyright (C) 2012, 2016 Etersoft
# Copyright (C) 2012 Vitaly Lipatov <lav@etersoft.ru> # Copyright (C) 2012, 2016 Vitaly Lipatov <lav@etersoft.ru>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by # it under the terms of the GNU Affero General Public License as published by
...@@ -85,9 +85,9 @@ __epm_changelog_unlocal_names() ...@@ -85,9 +85,9 @@ __epm_changelog_unlocal_names()
#yum-rpm) #yum-rpm)
# sudocmd yum clean all # sudocmd yum clean all
# ;; # ;;
#urpm-rpm) urpm-rpm)
# sudocmd urpmi --clean docmd urpmq --changelog $@ | less
# ;; ;;
#zypper-rpm) #zypper-rpm)
# sudocmd zypper clean # sudocmd zypper clean
# ;; # ;;
......
...@@ -59,6 +59,10 @@ case $PMTYPE in ...@@ -59,6 +59,10 @@ case $PMTYPE in
__epm_info_rpm_low && return __epm_info_rpm_low && return
docmd yum info $pkg_names docmd yum info $pkg_names
;; ;;
urpmi-rpm)
__epm_info_rpm_low && return
docmd urpmq -i $pkg_names
;;
dnf-rpm) dnf-rpm)
__epm_info_rpm_low && return __epm_info_rpm_low && return
docmd dnf info $pkg_names docmd dnf info $pkg_names
......
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2012-2013 Etersoft # Copyright (C) 2012-2013, 2016 Etersoft
# Copyright (C) 2012-2013 Vitaly Lipatov <lav@etersoft.ru> # Copyright (C) 2012-2013, 2016 Vitaly Lipatov <lav@etersoft.ru>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by # it under the terms of the GNU Affero General Public License as published by
...@@ -63,9 +63,12 @@ case $PMTYPE in ...@@ -63,9 +63,12 @@ case $PMTYPE in
fi fi
;; ;;
urpm-rpm|zypper-rpm) #zypper-rpm)
# FIXME: use hi level commands # # FIXME: use hi level commands
CMD="rpm -q --requires" # CMD="rpm -q --requires"
# ;;
urpm-rpm)
CMD="urpmq --requires"
;; ;;
yum-rpm) yum-rpm)
if is_installed $pkg_names ; then if is_installed $pkg_names ; then
......
...@@ -51,7 +51,7 @@ epm_upgrade() ...@@ -51,7 +51,7 @@ epm_upgrade()
;; ;;
urpm-rpm) urpm-rpm)
# or --auto-select --replace-files # or --auto-select --replace-files
CMD="urpmi --auto-update" CMD="urpmi --update --auto-select"
;; ;;
zypper-rpm) zypper-rpm)
CMD="zypper dist-upgrade" CMD="zypper dist-upgrade"
......
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2013 Etersoft # Copyright (C) 2013, 2016 Etersoft
# Copyright (C) 2013 Vitaly Lipatov <lav@etersoft.ru> # Copyright (C) 2013, 2016 Vitaly Lipatov <lav@etersoft.ru>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by # it under the terms of the GNU Affero General Public License as published by
...@@ -40,6 +40,9 @@ case $PMTYPE in ...@@ -40,6 +40,9 @@ case $PMTYPE in
yum-rpm) yum-rpm)
CMD="repoquery --whatrequires" CMD="repoquery --whatrequires"
;; ;;
urpm-rpm)
CMD="urpmq --whatrequires"
;;
dnf-rpm) dnf-rpm)
CMD="repoquery --whatrequires" CMD="repoquery --whatrequires"
;; ;;
......
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2013 Etersoft # Copyright (C) 2013, 2016 Etersoft
# Copyright (C) 2013 Vitaly Lipatov <lav@etersoft.ru> # Copyright (C) 2013, 2016 Vitaly Lipatov <lav@etersoft.ru>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by # it under the terms of the GNU Affero General Public License as published by
...@@ -38,6 +38,9 @@ case $PMTYPE in ...@@ -38,6 +38,9 @@ case $PMTYPE in
yum-rpm) yum-rpm)
CMD="yum whatprovides" CMD="yum whatprovides"
;; ;;
urpm-rpm)
CMD="urpmq --whatprovides"
;;
dnf-rpm) dnf-rpm)
CMD="yum provides" CMD="yum provides"
;; ;;
......
...@@ -99,24 +99,15 @@ is_active_systemd && CMD="systemd" ...@@ -99,24 +99,15 @@ is_active_systemd && CMD="systemd"
SERVICETYPE=$CMD SERVICETYPE=$CMD
ANYSERVICE=$(which anyservice 2>/dev/null) ANYSERVICE=$(which anyservice 2>/dev/null)
ANYSERVDIR="/etc/systemd-lite"
ANYSYSDDIR="/lib/systemd/system"
} }
# TODO: done it on anyservice part # TODO: done it on anyservice part
is_anyservice() is_anyservice()
{ {
local SERVICE="$1" [ -n "$ANYSERVICE" ] || return
# not, if we have no anyservice at all # check if anyservice is exists and checkd returns true
[ -n "$ANYSERVICE" ] || return 1 $ANYSERVICE "$1" checkd 2>/dev/null
# not, if there is regular service with the name
[ -d "$INITDIR/$SERVICE" ] && return 1
# yes, the service is anyservice driven
[ -r "$ANYSERVDIR/$SERVICE.service" ] && return 0
# yes, the service can be anyservice driven
[ -r "$ANYSYSDDIR/$SERVICE.service" ] && return 0
return 1
} }
......
...@@ -40,7 +40,7 @@ serv_list() ...@@ -40,7 +40,7 @@ serv_list()
done done
# TODO: только запущенные # TODO: только запущенные
if [ -n "$ANYSERVICE" ] ; then if [ -n "$ANYSERVICE" ] ; then
sudocmd anyservice list sudocmd $ANYSERVICE list
return return
fi fi
;; ;;
......
...@@ -49,9 +49,8 @@ is_service_autostart() ...@@ -49,9 +49,8 @@ is_service_autostart()
case $SERVICETYPE in case $SERVICETYPE in
service-chkconfig|service-upstart) service-chkconfig|service-upstart)
if is_anyservice $1; then if is_anyservice $SERVICE; then
# HACK: if is registered, assume it is autostarted $ANYSERVICE $SERVICE isautostarted
[ -r "$ANYSERVDIR/$SERVICE.service" ]
return return
fi fi
......
# This spec is backported to ALTLinux p8 automatically by rpmbph script from etersoft-build-utils. # This spec is backported to ALTLinux p8 automatically by rpmbph script from etersoft-build-utils.
# #
Name: eepm Name: eepm
Version: 1.8.8 Version: 1.9.0
Release: alt0.M80P.1 Release: alt0.M80P.1
Summary: Etersoft EPM package manager Summary: Etersoft EPM package manager
...@@ -67,9 +67,14 @@ chmod a+x %buildroot%_datadir/%name/{serv-,epm-}* ...@@ -67,9 +67,14 @@ chmod a+x %buildroot%_datadir/%name/{serv-,epm-}*
%_sysconfdir/bash_completion.d/cerv %_sysconfdir/bash_completion.d/cerv
%changelog %changelog
* Mon Aug 15 2016 Vitaly Lipatov <lav@altlinux.ru> 1.8.8-alt0.M80P.1 * Wed Aug 17 2016 Vitaly Lipatov <lav@altlinux.ru> 1.9.0-alt0.M80P.1
- backport to ALTLinux p8 (by rpmbph script) - backport to ALTLinux p8 (by rpmbph script)
* Wed Aug 17 2016 Vitaly Lipatov <lav@altlinux.ru> 1.9.0-alt1
- improve urpmi support
- serv: check anyservice support against anyservice version 0.3
- autoremove: ignore libvirt
* Mon Aug 15 2016 Vitaly Lipatov <lav@altlinux.ru> 1.8.8-alt1 * Mon Aug 15 2016 Vitaly Lipatov <lav@altlinux.ru> 1.8.8-alt1
- epm-install: skip low-level when install by path - epm-install: skip low-level when install by path
- anyservice support fixes - anyservice support fixes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment