Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2020-08-23 09:19:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base" Sun Aug 23 09:19:07 2020 rev:473 rq:827591 version:84.87+git20200818.b9dd70f Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2020-08-17 12:00:56.194545677 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new.3399/aaa_base.changes 2020-08-23 09:19:11.126618831 +0200 @@ -1,0 +2,19 @@ +Tue Aug 18 12:57:04 UTC 2020 - [email protected] + +- Update to version 84.87+git20200818.b9dd70f: + * backup-rpmdb: exit if zypp.pid is there and running + (bug#1161239) + +------------------------------------------------------------------- +Tue Aug 18 12:08:52 UTC 2020 - [email protected] + +- Update to version 84.87+git20200818.5220a5f: + * profile and csh.login: on s390x set TERM to dumb on serial console + * etc/profile add some missing ;; in case esac statements + * refresh_initrd call modprobe as /sbin/modprobe (bug#1011548) + * DIR_COLORS: merge TERM entries with list from (bug#1006973) + * sort TERM entries in etc/DIR_COLORS + * DIR_COLORS add TERM rxvt-unicode-256color (bug#1006973) + * Rename path() to _path() to avoid using a general name. + +------------------------------------------------------------------- Old: ---- aaa_base-84.87+git20200804.d7fb210.tar.xz New: ---- aaa_base-84.87+git20200818.b9dd70f.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.gqb5uX/_old 2020-08-23 09:19:11.990619309 +0200 +++ /var/tmp/diff_new_pack.gqb5uX/_new 2020-08-23 09:19:11.994619311 +0200 @@ -23,7 +23,7 @@ %endif Name: aaa_base -Version: 84.87+git20200804.d7fb210 +Version: 84.87+git20200818.b9dd70f Release: 0 URL: https://github.com/openSUSE/aaa_base # do not require systemd - aaa_base is in the build environment and we don't ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.gqb5uX/_old 2020-08-23 09:19:12.050619342 +0200 +++ /var/tmp/diff_new_pack.gqb5uX/_new 2020-08-23 09:19:12.054619344 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/aaa_base.git</param> - <param name="changesrevision">6b4e0de5756e3826efb402fef5cf7c81cf590674</param> + <param name="changesrevision">b9dd70f33a124556f16dbbafc89585a82218ad61</param> </service> </servicedata> \ No newline at end of file ++++++ aaa_base-84.87+git20200804.d7fb210.tar.xz -> aaa_base-84.87+git20200818.b9dd70f.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200804.d7fb210/files/etc/DIR_COLORS new/aaa_base-84.87+git20200818.b9dd70f/files/etc/DIR_COLORS --- old/aaa_base-84.87+git20200804.d7fb210/files/etc/DIR_COLORS 2020-08-04 11:13:35.000000000 +0200 +++ new/aaa_base-84.87+git20200818.b9dd70f/files/etc/DIR_COLORS 2020-08-18 14:56:16.000000000 +0200 @@ -16,9 +16,8 @@ OPTIONS -F -T 0 # Below, there should be one TERM entry for each termtype that is colorizable -TERM linux -TERM linux-c -TERM console +TERM ansi +TERM color-xterm TERM con132x25 TERM con132x30 TERM con132x43 @@ -29,20 +28,48 @@ TERM con80x43 TERM con80x50 TERM con80x60 +TERM cons25 +TERM console +TERM cygwin +TERM dtterm +TERM Eterm +TERM eterm-color TERM gnome +TERM gnome-256color +TERM iterm +TERM jfbterm +TERM konsole +TERM kterm +TERM linux +TERM linux-c TERM mach-color +TERM mlterm +TERM putty TERM rxvt +TERM rxvt-256color +TERM rxvt-cygwin +TERM rxvt-cygwin-native TERM rxvt-unicode +TERM rxvt-unicode-256color +TERM rxvt-unicode256 TERM screen -TERM screen-w TERM screen-256color +TERM screen-256color-bce +TERM screen-bce +TERM screen-w TERM screen.xterm-256color +TERM screen.linux +TERM screen.rxvt +TERM terminator TERM vt100 TERM vt102 TERM xterm -TERM xterm-debian +TERM xterm-16color TERM xterm-256color -TERM iterm +TERM xterm-88color +TERM xterm-color +TERM xterm-debian +TERM xterm-kitty # EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output) EIGHTBIT 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200804.d7fb210/files/etc/bash.bashrc new/aaa_base-84.87+git20200818.b9dd70f/files/etc/bash.bashrc --- old/aaa_base-84.87+git20200804.d7fb210/files/etc/bash.bashrc 2020-08-04 11:13:35.000000000 +0200 +++ new/aaa_base-84.87+git20200818.b9dd70f/files/etc/bash.bashrc 2020-08-18 14:56:16.000000000 +0200 @@ -73,7 +73,7 @@ # # Call common progams from /bin or /usr/bin only # -path () +_path () { if test -x /usr/bin/$1 ; then ${1+"/usr/bin/$@"} @@ -86,8 +86,8 @@ # # ksh/ash sometimes do not know # -test -z "$UID" && readonly UID=`path id -ur 2> /dev/null` -test -z "$EUID" && readonly EUID=`path id -u 2> /dev/null` +test -z "$UID" && readonly UID=`_path id -ur 2> /dev/null` +test -z "$EUID" && readonly EUID=`_path id -u 2> /dev/null` if test -s /etc/profile.d/ls.bash then . /etc/profile.d/ls.bash @@ -99,8 +99,8 @@ # Avoid trouble with Emacs shell mode # if test "$EMACS" = "t" ; then - path tset -I -Q - path stty cooked pass8 dec nl -echo + _path tset -I -Q + _path stty cooked pass8 dec nl -echo fi # @@ -140,8 +140,8 @@ # # Set xterm prompt with short path (last 18 characters) # - if path tput hs 2>/dev/null || path tput -T $TERM+sl hs 2>/dev/null || \ - path tput -T ${TERM%%[.-]*}+sl hs 2>/dev/null || \ + if _path tput hs 2>/dev/null || _path tput -T $TERM+sl hs 2>/dev/null || \ + _path tput -T ${TERM%%[.-]*}+sl hs 2>/dev/null || \ [[ $TERM = *xterm* || $TERM = *gnome* || $TERM = *konsole* || $TERM = *xfce* ]] then # @@ -156,18 +156,18 @@ _tsl=$(echo -en '\e]2;') _isl=$(echo -en '\e]1;') _fsl=$(echo -en '\007') - elif path tput -T $TERM+sl tsl 2>/dev/null ; then - _tsl=$(path tput -T $TERM+sl tsl 2>/dev/null) + elif _path tput -T $TERM+sl tsl 2>/dev/null ; then + _tsl=$(_path tput -T $TERM+sl tsl 2>/dev/null) _isl='' - _fsl=$(path tput -T $TERM+sl fsl 2>/dev/null) - elif path tput -T ${TERM%%[.-]*}+sl tsl 2>/dev/null ; then - _tsl=$(path tput -T $TERM+sl tsl 2>/dev/null) + _fsl=$(_path tput -T $TERM+sl fsl 2>/dev/null) + elif _path tput -T ${TERM%%[.-]*}+sl tsl 2>/dev/null ; then + _tsl=$(_path tput -T $TERM+sl tsl 2>/dev/null) _isl='' - _fsl=$(path tput -T $TERM+sl fsl 2>/dev/null) + _fsl=$(_path tput -T $TERM+sl fsl 2>/dev/null) else - _tsl=$(path tput tsl 2>/dev/null) + _tsl=$(_path tput tsl 2>/dev/null) _isl='' - _fsl=$(path tput fsl 2>/dev/null) + _fsl=$(_path tput fsl 2>/dev/null) fi _sc=$(tput sc 2>/dev/null) _rc=$(tput rc 2>/dev/null) @@ -199,8 +199,8 @@ # Other prompting for root if test "$UID" -eq 0 ; then if test -n "$TERM" -a -t ; then - _bred="$(path tput bold 2> /dev/null; path tput setaf 1 2> /dev/null)" - _sgr0="$(path tput sgr0 2> /dev/null)" + _bred="$(_path tput bold 2> /dev/null; _path tput setaf 1 2> /dev/null)" + _sgr0="$(_path tput sgr0 2> /dev/null)" fi # Colored root prompt (see bugzilla #144620) if test -n "$_bred" -a -n "$_sgr0" ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200804.d7fb210/files/etc/csh.login new/aaa_base-84.87+git20200818.b9dd70f/files/etc/csh.login --- old/aaa_base-84.87+git20200804.d7fb210/files/etc/csh.login 2020-08-04 11:13:35.000000000 +0200 +++ new/aaa_base-84.87+git20200818.b9dd70f/files/etc/csh.login 2020-08-18 14:56:16.000000000 +0200 @@ -26,6 +26,11 @@ if ( ! ${?TERM} ) setenv TERM linux if ( "$TERM" == "unknown" ) setenv TERM linux if ( "$TERM" == "ibm327x" ) setenv TERM dumb + if ( `uname -m` == "s390x" ) then + if ( "$tty" == "/dev/sclp_line0" || "$tty" == "/dev/ttyS0" ) ; then + if ( "$TERM" == "vt220" ) setenv TERM dumb + endif + endif if ( $TERM =~ screen.* && ! -e /usr/share/terminfo/s/$TERM) setenv TERM screen if ( ! ${?SSH_TTY} && "$TERM" != "dumb" ) then path stty sane cr0 pass8 dec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200804.d7fb210/files/etc/profile new/aaa_base-84.87+git20200818.b9dd70f/files/etc/profile --- old/aaa_base-84.87+git20200804.d7fb210/files/etc/profile 2020-08-04 11:13:35.000000000 +0200 +++ new/aaa_base-84.87+git20200818.b9dd70f/files/etc/profile 2020-08-18 14:56:16.000000000 +0200 @@ -64,7 +64,7 @@ # # Call common progams from /bin or /usr/bin only # -path () +_path () { command -p ${1+"$@"} } @@ -72,20 +72,25 @@ # # Initialize terminal # -tty=`path tty 2> /dev/null` +tty=`_path tty 2> /dev/null` test $? -ne 0 && tty="" if test -O "$tty" -a -n "$PS1"; then test -z "${TERM}" && { TERM=linux; export TERM; } test "${TERM}" = "unknown" && { TERM=linux; export TERM; } test "${TERM}" = "ibm327x" && { TERM=dumb; export TERM; } + if test "$(uname -m)" = "s390x" ; then + if test "$tty" = "/dev/sclp_line0" -o "$tty" = "/dev/ttyS0" ; then + test "${TERM}" = "vt220" && { TERM=dumb; export TERM; } + fi + fi case "$TERM" in screen.*) - test -e /usr/share/terminfo/s/${TERM} || { TERM=screen; export TERM; } + test -e /usr/share/terminfo/s/${TERM} || { TERM=screen; export TERM; } ;; esac # Do not change settings on local line if connected to remote if test -z "$SSH_TTY" -a "${TERM}" != "dumb" ; then - path stty sane cr0 pass8 dec - path tset -I -Q + _path stty sane cr0 pass8 dec + _path tset -I -Q fi fi unset TERMCAP @@ -116,9 +121,9 @@ # # ksh/ash sometimes do not know # -test -z "$UID" && readonly UID=`path id -ur 2> /dev/null` -test -z "$EUID" && readonly EUID=`path id -u 2> /dev/null` -test -z "$USER" && USER=`path id -un 2> /dev/null` +test -z "$UID" && readonly UID=`_path id -ur 2> /dev/null` +test -z "$EUID" && readonly EUID=`_path id -u 2> /dev/null` +test -z "$USER" && USER=`_path id -un 2> /dev/null` test -z "$MAIL" && MAIL=/var/spool/mail/$USER if test -x /usr/bin/uname ; then test -z "$HOST" && HOST=`/usr/bin/uname -n` @@ -384,7 +389,7 @@ echo "Directory: $PWD" # Last but not least date - fi + fi ;; esac unset ORIG_PATH unset is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200804.d7fb210/files/usr/lib/base-scripts/backup-rpmdb new/aaa_base-84.87+git20200818.b9dd70f/files/usr/lib/base-scripts/backup-rpmdb --- old/aaa_base-84.87+git20200804.d7fb210/files/usr/lib/base-scripts/backup-rpmdb 2020-08-04 11:13:35.000000000 +0200 +++ new/aaa_base-84.87+git20200818.b9dd70f/files/usr/lib/base-scripts/backup-rpmdb 2020-08-18 14:56:16.000000000 +0200 @@ -16,6 +16,15 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin export PATH +if [ -s /var/run/zypp.pid ] ; then + ZYPP_PID=$(cat /var/run/zypp.pid) + if [ -e /proc/$ZYPP_PID ] ; then + echo "zypp seems to be running with pid $ZYPP_PID" + echo "exiting backup-rpmdb gracefully" + exit 0 + fi +fi + RPMDB_PATH="/usr/lib/sysimage/rpm" # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-84.87+git20200804.d7fb210/files/usr/sbin/refresh_initrd new/aaa_base-84.87+git20200818.b9dd70f/files/usr/sbin/refresh_initrd --- old/aaa_base-84.87+git20200804.d7fb210/files/usr/sbin/refresh_initrd 2020-08-04 11:13:35.000000000 +0200 +++ new/aaa_base-84.87+git20200818.b9dd70f/files/usr/sbin/refresh_initrd 2020-08-18 14:56:16.000000000 +0200 @@ -27,7 +27,7 @@ test "$refresh" = yes || exit 0 -modprobe dm_mod --quiet &> /dev/null || true +/sbin/modprobe dm_mod --quiet &> /dev/null || true line=on test -e /proc/splash && read line < /proc/splash
