October 2014 - openSUSE Commits - openSUSE Mailing Lists

commit OpenIPMI for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '14

31 Oct '14

Hello community, here is the log from the commit of package OpenIPMI for openSUSE:Factory checked in at 2014-10-31 09:39:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenIPMI (Old) and /work/SRC/openSUSE:Factory/.OpenIPMI.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "OpenIPMI" Changes: -------- --- /work/SRC/openSUSE:Factory/OpenIPMI/OpenIPMI.changes 2014-03-16 08:04:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.OpenIPMI.new/OpenIPMI.changes 2014-10-31 12:22:49.000000000 +0100 @@ -1,0 +2,18 @@ +Sat Oct 25 13:24:06 UTC 2014 - p.drouand(a)gmail.com + +- Use systemd instead of sysvinit + + Add ipmi.service + + Add openipmi-helper to keep capabilities of sysvinit script + + Add systemd related macros +- Remove obsolete/depreciated macros + +------------------------------------------------------------------- +Thu Jul 10 15:08:21 UTC 2014 - trenn(a)suse.de + +- Split OpenIPMI into base package and OpenIPMI-python + OpenIPMI-python gets OpenIPMI python library and openipmigui which is + a python based gui. + Like above the OpenIPMI base package does not need python-tk and tix + packages any more. + +------------------------------------------------------------------- Old: ---- openipmi.initscript New: ---- ipmi.service openipmi-helper ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenIPMI.spec ++++++ --- /var/tmp/diff_new_pack.p6JTDO/_old 2014-10-31 12:22:50.000000000 +0100 +++ /var/tmp/diff_new_pack.p6JTDO/_new 2014-10-31 12:22:50.000000000 +0100 @@ -16,9 +16,6 @@ # -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} - Name: OpenIPMI BuildRequires: gd-devel BuildRequires: gdbm-devel @@ -29,22 +26,22 @@ BuildRequires: ncurses-devel BuildRequires: net-snmp-devel BuildRequires: openssl-devel -%if 0%{?suse_version} > 1200 BuildRequires: perl-macros -%endif BuildRequires: pkg-config BuildRequires: popt-devel BuildRequires: python-devel BuildRequires: python-tk BuildRequires: python-xml BuildRequires: swig +BuildRequires: systemd BuildRequires: tcl-devel BuildRequires: tix Version: 2.0.21 Release: 0 Source0: http://prdownloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz Source1: sysconfig.ipmi -Source2: openipmi.initscript +Source2: ipmi.service +Source3: openipmi-helper Patch0: OpenIPMI-prefer_perl_vendor.patch Patch2: OpenIPMI-libtool.patch Patch7: fix-conversions.patch @@ -53,24 +50,14 @@ Provides: ipmi_ui Provides: ipmicmd Provides: ipmilan -Provides: openipmigui -Requires: python-tk BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: OpenIPMI License: LGPL-2.1+ Group: System/Monitoring -PreReq: %install_info_prereq %insserv_prereq %fillup_prereq -%if 0%{?suse_version} > 1200 +PreReq: %install_info_prereq +PreReq: %fillup_prereq +%{?systemd_requires} %{perl_requires} -%else -%define perl_version %(eval "`%{__perl} -V:version`"; echo $version) -%if 0%{?fedora} -%define perl_requires perl(:MODULE_COMPAT_%{perl_version}) -Requires: %{perl_version} -%else -Requires: perl = %{perl_version} -%endif -%endif # Perl is sometimes installed in /usr/lib, not /usr/lib64 on 64-bit platforms. # %define perl_libdir %{_exec_prefix}/lib @@ -99,6 +86,18 @@ These libraries are needed to get full access to the OpenIPMI functions. +%package python +License: LGPL-2.1+ +Summary: OpenIPMI +Group: System/Monitoring +Requires: OpenIPMI python-tk tix +Provides: openipmigui +AutoReqProv: on + +%description python +The python parts provide a OpenIPMI python library and a GUI, openipmigui +making use of it. + %prep %setup -n %{name}-%{version} %patch0 -p1 @@ -118,11 +117,13 @@ %install make DESTDIR=$RPM_BUILD_ROOT install install -d $RPM_BUILD_ROOT/var/adm/fillup-templates -install -d $RPM_BUILD_ROOT/etc/init.d +install -d $RPM_BUILD_ROOT%{_unitdir} install -d $RPM_BUILD_ROOT/sbin install -m 644 %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m 755 %{S:2} $RPM_BUILD_ROOT/etc/init.d/ipmi -ln -sf ../etc/init.d/ipmi $RPM_BUILD_ROOT/sbin/rcipmi +install -m 755 %{S:2} %{buildroot}%{_unitdir} +ln -s /usr/sbin/service $RPM_BUILD_ROOT/sbin/rcipmi +install -d ${RPM_BUILD_ROOT}%{_libexecdir} +install -m 755 %{S:3} ${RPM_BUILD_ROOT}%{_libexecdir}/openipmi-helper %{__rm} -f %{buildroot}%{_libdir}/*.la # rebuild python files to fix timestamps: @@ -132,17 +133,20 @@ %__python -c 'import compileall; compileall.compile_dir("%{buildroot}'"$d"'",ddir="'"$d"'",force=1)' done -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} +%pre +%service_add_pre ipmi.service + +%preun +%service_del_preun ipmi.service %post /sbin/ldconfig -%{fillup_and_insserv -n ipmi ipmi} +%{fillup_only} +%service_add_post ipmi.service %postun /sbin/ldconfig -%restart_on_update ipmi -%insserv_cleanup +%service_add_post ipmi.service %post devel %install_info --info-dir=%_infodir %_infodir/%name.info.gz @@ -155,23 +159,17 @@ %doc CONFIGURING_FOR_LAN COPYING COPYING.BSD COPYING.LIB FAQ %doc README README.Force README.MotorolaMXP /var/adm/fillup-templates/sysconfig.ipmi -/etc/init.d/ipmi +%{_unitdir}/ipmi.service /sbin/rcipmi %{_libdir}/libOpenIPMI*.so.* +%{_libexecdir}/openipmi-helper %dir %{_sysconfdir}/ipmi %config(noreplace) %{_sysconfdir}/ipmi/* ###### perl files ###### %dir %{perl_vendorarch}/auto/OpenIPMI %{perl_vendorarch}/auto/OpenIPMI/OpenIPMI.so %{perl_vendorarch}/OpenIPMI.pm -%doc swig/OpenIPMI.i swig/perl/sample swig/perl/ipmi_powerctl -###### python files ###### -%{py_sitedir}/*OpenIPMI.* -%doc swig/OpenIPMI.i -###### gui files ###### -%dir %{py_sitedir}/openipmigui -%{py_sitedir}/openipmigui/* -%{_bindir}/openipmigui +%doc swig/perl/sample swig/perl/ipmi_powerctl ###### ui files ###### %{_bindir}/ipmi_sim @@ -186,7 +184,6 @@ %doc %{_mandir}/man1/ipmi_ui.1* %doc %{_mandir}/man1/openipmicmd.1* %doc %{_mandir}/man1/openipmish.1* -%doc %{_mandir}/man1/openipmigui.1* %doc %{_mandir}/man1/solterm.1* %doc %{_mandir}/man1/rmcp_ping.1* %doc %{_mandir}/man1/ipmi_sim.1* @@ -207,4 +204,14 @@ %doc doc/IPMI.pdf ################################################### +%files python +%defattr(644,root,root,755) +%{py_sitedir}/*OpenIPMI.* +%doc swig/OpenIPMI.i +###### gui files ###### +%dir %{py_sitedir}/openipmigui +%{py_sitedir}/openipmigui/* +%{_bindir}/openipmigui +%doc %{_mandir}/man1/openipmigui.1* + %changelog ++++++ ipmi.service ++++++ [Unit] Description=IPMI Driver After=network.target [Service] Type=oneshot RemainAfterExit=yes ExecStart=/usr/lib/openipmi-helper start ExecStop=/usr/lib/openipmi-helper stop [Install] WantedBy=multi-user.target ++++++ openipmi-helper ++++++ #!/bin/sh ############################################################################# # # ipmi: OpenIPMI Driver helper script # # Authors: Jan Safranek <jsafrane(a)redhat.com> # # Based on IPMI init script by: # Matt Domsch <Matt_Domsch(a)dell.com> # Chris Poblete <Chris_Poblete(a)dell.com> # # Status return code bits # no bits set = no errors # bit 0 set = minimum modules aren't loaded # bit 1 set = requested feature module isn't loaded # bit 2 set = /dev/ipmi0 (or /dev/imb if using that instead) doesn't exist # bit 3 set = /dev/watchdog doesn't exist # bit 4 set = lockfile doesn't exist # bit 5 set = modules are loaded even when asked to be unloaded CONFIGFILE=/etc/sysconfig/ipmi # source config info [ -r ${CONFIGFILE} ] && . ${CONFIGFILE} ############################################################################# # GLOBALS ############################################################################# MODULE_NAME="ipmi" INTF_NUM=0 IPMI_SMB_MODULE_NAME="ipmi_smb" IPMI_SI_MODULE_NAME="ipmi_si" kernel=`uname -r | cut -d. -f1-2` if [ "${kernel}" == "2.4" ]; then IPMI_SMB_MODULE_NAME="ipmi_smb_intf" IPMI_SI_MODULE_NAME="ipmi_si_drv" fi MODULES_INTERFACES="" [ "${DEV_IPMI}" = "yes" ] && MODULES_INTERFACES="${MODULES_INTERFACES} ipmi_devintf" [ "${IPMI_IMB}" = "yes" ] && MODULES_INTERFACES="${MODULES_INTERFACES} ipmi_imb" MODULES_FEATURES="" [ "${IPMI_WATCHDOG}" = "yes" ] && MODULES_FEATURES="${MODULES_FEATURES} ipmi_watchdog" [ "${IPMI_POWEROFF}" = "yes" ] && MODULES_FEATURES="${MODULES_FEATURES} ipmi_poweroff" MODULES_HW="" [ "${IPMI_SI}" = "yes" ] && MODULES_HW="${MODULES_HW} ${IPMI_SI_MODULE_NAME}" [ "${IPMI_SMB}" = "yes" ] && MODULES_HW="${MODULES_HW} ${IPMI_SMB_MODULE_NAME}" MODULES_BASE="ipmi_msghandler" MODULES="${MODULES_INTERFACES} ${MODULES_FEATURES} ${MODULES_HW} ${MODULES_BASE}" RETVAL=0 LOCKFILE=/var/lock/subsys/ipmi DEV_IPMI_TIMEOUT=150 UDEV_EXISTS=0 if [ -e /sbin/udev -o -e /sbin/udevd ]; then UDEV_EXISTS=1 fi ############################################################################# # NOTES: # * /dev/ipmi0 is unconditionally deleted here on ipmi_devintf unload, # because SLES9 and RHEL4 kernels don't send a message for udev to delete # it for us. # ############################################################################# modules_loaded_verbose() { OnePlusLoaded=0 OnePlusUnloaded=0 for m in $@; do if /sbin/lsmod | grep $m >/dev/null 2>&1 ; then echo "$m module loaded." OnePlusLoaded=1 else echo "$m module not loaded." OnePlusUnloaded=1 fi done } modules_loaded() { OnePlusLoaded=0 OnePlusUnloaded=0 for m in $@; do if /sbin/lsmod | grep $m >/dev/null 2>&1 ; then OnePlusLoaded=1 else OnePlusUnloaded=1 fi done } device_node_exists () { if [ -e "$1" ]; then echo "$1 exists." return 1 fi echo "$1 does not exist." return 0 } minimum_modules_loaded() { rc_base=1 rc_hw=1 modules_loaded_verbose "${MODULES_BASE}" [ ${OnePlusLoaded} -eq 0 ] && rc_base=0 modules_loaded_verbose "${MODULES_HW}" [ ${OnePlusLoaded} -eq 0 ] && rc_hw=0 return $((rc_base && rc_hw)) } ############################################################################# load_si() { if [ "${IPMI_SI}" = "yes" ]; then modprobe ${IPMI_SI_MODULE_NAME} > /dev/null 2>&1 modules_loaded ${IPMI_SI_MODULE_NAME} [ ${OnePlusLoaded} -ne 1 ] && RETVAL=$((RETVAL | 1)) fi } load_smb() { if [ "${IPMI_SMB}" = "yes" ]; then modprobe ${IPMI_SMB_MODULE_NAME} > /dev/null 2>&1 modules_loaded ${IPMI_SMB_MODULE_NAME} [ ${OnePlusLoaded} -ne 1 ] && RETVAL=$((RETVAL | 1)) fi } load_hw_modules() { load_si load_smb } start_watchdog_common() { load_hw_modules modprobe ipmi_watchdog ${IPMI_WATCHDOG_OPTIONS} > /dev/null 2>&1 modules_loaded ipmi_watchdog [ ${OnePlusUnloaded} -ne 0 ] && RETVAL=$((RETVAL | 2)) && echo "Watchdog startup failed: cannot load ipmi_watchdog module" && return if [ ${UDEV_EXISTS} -eq 0 -a ! -e /dev/watchdog ]; then mknod -m 0600 /dev/watchdog c 10 130 [ $? -ne 0 ] && RETVAL=$((RETVAL | 8)) && echo "Watchdog startup failed: cannot create /dev/watchdog" && return fi } start_watchdog_quiet() { [ "${IPMI_WATCHDOG}" != "yes" ] && return start_watchdog_common } start_watchdog() { [ "${IPMI_WATCHDOG}" != "yes" ] && RETVAL=$((RETVAL | 2)) && echo "Watchdog not configured" && return start_watchdog_common } stop_watchdog() { modprobe -q -r ipmi_watchdog > /dev/null 2>&1 modules_loaded ipmi_watchdog if [ ${OnePlusLoaded} -ne 0 ]; then RETVAL=$((RETVAL | 32)) echo "Watchog shutdown failed: cannot unload ipmi_watchdog module" else if [ "${IPMI_WATCHDOG}" = "yes" ]; then [ ${UDEV_EXISTS} -eq 0 ] && rm -f /dev/watchdog fi fi } stop_watchdog_quiet() { modprobe -q -r ipmi_watchdog > /dev/null 2>&1 modules_loaded ipmi_watchdog if [ ${OnePlusLoaded} -ne 0 ]; then RETVAL=$((RETVAL | 32)) else if [ "${IPMI_WATCHDOG}" = "yes" ]; then [ ${UDEV_EXISTS} -eq 0 ] && rm -f /dev/watchdog fi fi } start_powercontrol_common() { local poweroff_opts="" load_hw_modules if [ "${IPMI_POWERCYCLE}" == "yes" ]; then modinfo ipmi_poweroff 2>/dev/null | grep poweroff_control > /dev/null 2>&1 && \ poweroff_opts="poweroff_control=2" modinfo ipmi_poweroff 2>/dev/null | grep poweroff_powercycle > /dev/null 2>&1 && \ poweroff_opts="poweroff_powercycle=1" fi modprobe ipmi_poweroff "${poweroff_opts}" > /dev/null 2>&1 modules_loaded ipmi_poweroff [ ${OnePlusUnloaded} -ne 0 ] && RETVAL=$((RETVAL | 2)) && echo "Powercontroll startup failed: cannot load ipmi_poweroff module" && return } start_powercontrol_quiet() { [ "${IPMI_POWEROFF}" != "yes" ] && return start_powercontrol_common } start_powercontrol() { [ "${IPMI_POWEROFF}" != "yes" ] && RETVAL=$((RETVAL | 2)) && echo "Powercontroll not configured" && return start_powercontrol_common } stop_powercontrol() { modprobe -q -r ipmi_poweroff > /dev/null 2>&1 modules_loaded ipmi_poweroff if [ ${OnePlusLoaded} -ne 0 ]; then RETVAL=$((RETVAL | 32)) echo "Powercontroll shutdown failed: cannot unload ipmi_poweroff module" fi } stop_powercontrol_quiet() { modprobe -q -r ipmi_poweroff > /dev/null 2>&1 modules_loaded ipmi_poweroff [ ${OnePlusLoaded} -ne 0 ] && RETVAL=$((RETVAL | 32)) } ############################################################################# unload_all_ipmi_modules() { stop_watchdog_quiet stop_powercontrol_quiet for m in ${MODULES}; do modprobe -q -r ${m} > /dev/null 2>&1 done # delete interface node ONLY if ipmi_devintf is unloaded [ `lsmod | grep -c "ipmi_devintf"` -eq 0 ] && rm -f "/dev/ipmi${INTF_NUM}" } unload_ipmi_modules_leave_features() { for m in ${MODULES_INTERFACES}; do modprobe -q -r ${m} > /dev/null 2>&1 done # delete interface node ONLY if ipmi_devintf is unloaded [ `lsmod | grep -c "ipmi_devintf"` -eq 0 ] && rm -f "/dev/ipmi${INTF_NUM}" lsmod | egrep -q "ipmi_(poweroff|watchdog)" > /dev/null 2>&1 if [ "$?" -ne "0" ]; then stop_watchdog_quiet stop_powercontrol_quiet for m in ${MODULES}; do modprobe -q -r ${m} > /dev/null 2>&1 done fi } ############################################################################# load_ipmi_modules () { local locdelay modprobe ipmi_msghandler > /dev/null 2>&1 modules_loaded ipmi_msghandler [ ${OnePlusLoaded} -ne 1 ] && unload_all_ipmi_modules && RETVAL=$((RETVAL | 1)) && return load_hw_modules [ $((RETVAL & 1)) -eq 1 ] && unload_all_ipmi_modules && RETVAL=$((RETVAL | 1)) && return if [ "${DEV_IPMI}" = "yes" ]; then modprobe ipmi_devintf > /dev/null 2>&1 modules_loaded ipmi_devintf RETVAL=$((RETVAL & ~2)) [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2)) if [ ${OnePlusLoaded} -eq 1 ]; then if [ ${UDEV_EXISTS} -eq 0 ]; then DEVMAJOR=`cat /proc/devices | awk '/ipmidev/{print $1}'` rm -f /dev/ipmi${INTF_NUM} mknod -m 0600 /dev/ipmi${INTF_NUM} c ${DEVMAJOR} 0 || RETVAL=$((RETVAL | 4)) fi # udev can take several seconds to create /dev/ipmi0, # but it happens asynchronously, so delay here locdelay=${DEV_IPMI_TIMEOUT} while [ ! -e /dev/ipmi${INTF_NUM} -a ${locdelay} -gt 0 ]; do locdelay=$((locdelay - 1)) sleep 0.1 done fi fi if [ "${IPMI_IMB}" = "yes" ]; then modprobe ipmi_imb > /dev/null 2>&1 modules_loaded ipmi_imb RETVAL=$((RETVAL & ~2)) [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2)) if [ ${OnePlusLoaded} -eq 1 ]; then DEVMAJOR=`cat /proc/devices | awk '/imb/{print $1}'` rm -f /dev/imb mknod -m 0600 /dev/imb c ${DEVMAJOR} 0 || RETVAL=$((RETVAL | 4)) fi fi # Per Corey Minyard, essentially no one uses ipmi_radisys # and we don't want to encourage its further use # so it won't be handled here. return } ############################################################################# start() { load_ipmi_modules if [ ${RETVAL} -eq 0 ]; then touch ${LOCKFILE} else if [ $((RETVAL & 1)) -eq 1 ]; then echo "Startup failed." else touch ${LOCKFILE} && echo "Warning!?" fi fi start_watchdog_quiet start_powercontrol_quiet } ############################################################################# stop() { unload_ipmi_modules_leave_features modules_loaded ${MODULES_INTERFACES} if [ ${OnePlusLoaded} -ne 0 ]; then RETVAL=$((RETVAL | 32)) echo "Shutdown failed, something may be in use" else rm -f ${LOCKFILE} fi } stop_all() { unload_all_ipmi_modules modules_loaded ${MODULES} if [ ${OnePlusLoaded} -ne 0 ]; then RETVAL=$((RETVAL | 32)) echo "Shutdown failed, something may be in use" else rm -f ${LOCKFILE} fi } ############################################################################# restart() { stop_all RETVAL=0 start } ############################################################################# reload() { stop_all RETVAL=0 start } ############################################################################# status_all() { minimum_modules_loaded [ $? -eq 0 ] && RETVAL=$((RETVAL | 1)) modules_loaded_verbose ${MODULES_FEATURES} ${MODULES_INTERFACES} [ ${OnePlusUnloaded} -ne 0 ] && RETVAL=$((RETVAL | 2)) if [ "${DEV_IPMI}" = "yes" ]; then device_node_exists /dev/ipmi${INTF_NUM} [ $? -eq 0 ] && RETVAL=$((RETVAL | 4)) fi if [ "${IPMI_IMB}" = "yes" ]; then device_node_exists /dev/imb [ $? -eq 0 ] && RETVAL=$((RETVAL | 4)) fi if [ "${IPMI_WATCHDOG}" = "yes" ]; then device_node_exists /dev/watchdog [ $? -eq 0 ] && RETVAL=$((RETVAL | 8)) fi [ ! -e ${LOCKFILE} ] && RETVAL=$((RETVAL | 16)) } status() { minimum_modules_loaded [ $? -eq 0 ] && RETVAL=$((RETVAL | 1)) if [ "${DEV_IPMI}" = "yes" ]; then modules_loaded_verbose ipmi_devintf [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2)) device_node_exists /dev/ipmi${INTF_NUM} [ $? -eq 0 ] && RETVAL=$((RETVAL | 4)) fi if [ "${IPMI_IMB}" = "yes" ]; then device_node_exists /dev/imb [ $? -eq 0 ] && RETVAL=$((RETVAL | 4)) fi } status_watchdog() { minimum_modules_loaded [ $? -eq 0 ] && RETVAL=$((RETVAL | 1)) modules_loaded_verbose ipmi_watchdog [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2)) device_node_exists /dev/watchdog [ $? -eq 0 ] && RETVAL=$((RETVAL | 8)) } status_powercontrol() { minimum_modules_loaded [ $? -eq 0 ] && RETVAL=$((RETVAL | 1)) modules_loaded_verbose ipmi_powercontrol [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2)) } ############################################################################# usage () { echo $"Usage: $0 {start|stop|status" 1>&2 echo $" restart|condrestart|try-restart|reload|force-reload" 1>&2 echo $" start-watchdog|stop-watchdog|status-watchdog" 1>&2 echo $" start-powercontrol|stop-powercontrol|status-powercontrol" 1>&2 echo $" stop-all|status-all}" 1>&2 RETVAL=2 } condrestart () { [ -e ${LOCKFILE} ] && restart } ############################################################################# # MAIN ############################################################################# case "$1" in start) start ;; stop) stop ;; restart) restart ;; force-reload) reload ;; reload) reload ;; status) status ;; status-all) status_all ;; condrestart) condrestart ;; try-restart) condrestart ;; start-watchdog) start_watchdog ;; stop-watchdog) stop_watchdog ;; status-watchdog) status_watchdog ;; start-powercontrol) start_powercontrol ;; stop-powercontrol) stop_powercontrol ;; status-powercontrol) status_powercontrol ;; stop-all) stop_all ;; *) usage ;; esac exit ${RETVAL} ############################################################################# # end of file ############################################################################# -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Mesa for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '14

31 Oct '14

Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2014-10-31 09:39:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa (Old) and /work/SRC/openSUSE:Factory/.Mesa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Mesa" Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa/Mesa.changes 2014-10-15 21:58:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Mesa.new/Mesa.changes 2014-10-31 12:22:47.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Oct 30 09:37:08 UTC 2014 - jengelh(a)inai.de + +- Update descriptions and Requires for GLES3 + +------------------------------------------------------------------- +Sat Oct 25 10:24:33 UTC 2014 - josua.mayer97(a)gmail.com + +- add Mesa-devel-dri package: + This way dri.pc will no longer pull in all of Mesa, just as + packages requiring dri do not have to require Mesa-devel anymore + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.FWIWey/_old 2014-10-31 12:22:48.000000000 +0100 +++ /var/tmp/diff_new_pack.FWIWey/_new 2014-10-31 12:22:48.000000000 +0100 @@ -167,6 +167,7 @@ Summary: Libraries, includes and more to develop Mesa applications Group: Development/Libraries/X11 Requires: Mesa = %version +Requires: Mesa-dri-devel = %version Requires: Mesa-libEGL-devel = %version Requires: Mesa-libGL-devel = %version Requires: Mesa-libGLESv1_CM-devel = %version @@ -309,6 +310,9 @@ OpenGL|ES 2.x provides an API for programmable hardware including vertex and fragment shaders. +The libGLESv2.so.2 library provides symbols for all OpenGL ES 2 and +ES 3 entry points. + %package -n Mesa-libGLESv2-devel Summary: Development files for the OpenGL ES 2.x API Group: Development/Libraries/C and C++ @@ -330,7 +334,7 @@ %package -n Mesa-libGLESv3-devel Summary: Development files for the OpenGL ES 3.x API Group: Development/Libraries/C and C++ -#Requires: Mesa-libGLESv3-3 = %version +Requires: Mesa-libGLESv2-2 = %version Requires: pkgconfig(egl) %description -n Mesa-libGLESv3-devel @@ -380,6 +384,15 @@ dispatching all the gl* functions. It is intended to be mainly used by the Mesa-libGLES* packages. +%package -n Mesa-dri-devel +Summary: Development files for the DRI API +Group: Development/Libraries/C and C++ +Requires: Mesa = %version + +%description -n Mesa-dri-devel +This package contains the development environment required for +compiling programs and libraries using the DRI API. + %package -n libgbm1 Summary: Generic buffer management API Group: System/Libraries @@ -833,10 +846,13 @@ %defattr(-,root,root) %_libdir/libglapi.so -%files devel +%files -n Mesa-dri-devel %defattr(-,root,root) -%doc docs/*.html %_includedir/GL/internal %_libdir/pkgconfig/dri.pc +%files devel +%defattr(-,root,root) +%doc docs/*.html + %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 29 Oct '14

29 Oct '14

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-10-29 21:10:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2014-10-19 19:27:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-10-29 21:11:40.000000000 +0100 @@ -1,0 +2,26 @@ +Wed Oct 29 14:13:52 UTC 2014 - jreidinger(a)suse.com + +- do not return /dev/null if cannot detect bootloader devices as it + cause errors later + +------------------------------------------------------------------- +Wed Oct 29 13:18:10 UTC 2014 - jreidinger(a)suse.com + +- do not show warning if boot from extended partition (bnc#898023) +- 3.1.108 + +------------------------------------------------------------------- +Wed Oct 29 07:16:22 UTC 2014 - jreidinger(a)suse.com + +- fix branding activation on live CD and also with kexec enabled + (bnc#897847) +- 3.1.107 + +------------------------------------------------------------------- +Fri Oct 24 14:30:20 UTC 2014 - jreidinger(a)suse.com + +- fix crash during installation if kernel parameter is not + pre-proposed (bnc#902397) +- 3.1.106 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.105.tar.bz2 New: ---- yast2-bootloader-3.1.108.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.IHzFnw/_old 2014-10-29 21:11:41.000000000 +0100 +++ /var/tmp/diff_new_pack.IHzFnw/_new 2014-10-29 21:11:41.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.105 +Version: 3.1.108 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -133,7 +133,7 @@ %dir %{yast_docdir} %doc %{yast_docdir}/COPYING -%doc %{yast_docdir}/README +%doc %{yast_docdir}/README.md %doc %{yast_docdir}/CONTRIBUTING.md %files devel-doc ++++++ yast2-bootloader-3.1.105.tar.bz2 -> yast2-bootloader-3.1.108.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.105/.travis.yml new/yast2-bootloader-3.1.108/.travis.yml --- old/yast2-bootloader-3.1.105/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-3.1.108/.travis.yml 2014-10-29 15:32:14.000000000 +0100 @@ -0,0 +1,16 @@ +language: cpp +compiler: + - gcc +before_install: + - curl http://download.opensuse.org/repositories/YaST:/Head:/Travis/xUbuntu_12.04/… | sudo apt-key add - + - echo "deb http://download.opensuse.org/repositories/YaST:/Head:/Travis/xUbuntu_12.04/ ./" | sudo tee -a /etc/apt/sources.list + - sudo apt-get update -q + - sudo apt-get install --no-install-recommends -y yast2 yast2-storage + # disable rvm, use system Ruby + - rvm reset + - sudo gem install rake yast-rake yard rspec:2.14.1 +script: + - yardoc + - rake test:unit + - sudo rake install + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.105/README new/yast2-bootloader-3.1.108/README --- old/yast2-bootloader-3.1.105/README 2014-10-16 08:02:11.000000000 +0200 +++ new/yast2-bootloader-3.1.108/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -yast2-bootloader is part of YaST2 -See the file COPYRIGHT.english for license terms diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.105/README.md new/yast2-bootloader-3.1.108/README.md --- old/yast2-bootloader-3.1.105/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-3.1.108/README.md 2014-10-29 15:32:14.000000000 +0100 @@ -0,0 +1,5 @@ +# YaST - The Bootloader Module # + +[![Travis Build](https://travis-ci.org/yast/yast-bootloader.svg?branch=master)](https… +[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-bootloade… + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.105/package/yast2-bootloader.changes new/yast2-bootloader-3.1.108/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.105/package/yast2-bootloader.changes 2014-10-16 08:02:11.000000000 +0200 +++ new/yast2-bootloader-3.1.108/package/yast2-bootloader.changes 2014-10-29 15:32:14.000000000 +0100 @@ -1,4 +1,30 @@ ------------------------------------------------------------------- +Wed Oct 29 14:13:52 UTC 2014 - jreidinger(a)suse.com + +- do not return /dev/null if cannot detect bootloader devices as it + cause errors later + +------------------------------------------------------------------- +Wed Oct 29 13:18:10 UTC 2014 - jreidinger(a)suse.com + +- do not show warning if boot from extended partition (bnc#898023) +- 3.1.108 + +------------------------------------------------------------------- +Wed Oct 29 07:16:22 UTC 2014 - jreidinger(a)suse.com + +- fix branding activation on live CD and also with kexec enabled + (bnc#897847) +- 3.1.107 + +------------------------------------------------------------------- +Fri Oct 24 14:30:20 UTC 2014 - jreidinger(a)suse.com + +- fix crash during installation if kernel parameter is not + pre-proposed (bnc#902397) +- 3.1.106 + +------------------------------------------------------------------- Wed Oct 15 11:50:20 UTC 2014 - jreidinger(a)suse.com - improve usability of device map editor (bnc#900807) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.105/package/yast2-bootloader.spec new/yast2-bootloader-3.1.108/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.105/package/yast2-bootloader.spec 2014-10-16 08:02:11.000000000 +0200 +++ new/yast2-bootloader-3.1.108/package/yast2-bootloader.spec 2014-10-29 15:32:14.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.105 +Version: 3.1.108 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -117,7 +117,7 @@ %dir %{yast_docdir} %doc %{yast_docdir}/COPYING -%doc %{yast_docdir}/README +%doc %{yast_docdir}/README.md %doc %{yast_docdir}/CONTRIBUTING.md %files devel-doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.105/src/clients/bootloader_finish.rb new/yast2-bootloader-3.1.108/src/clients/bootloader_finish.rb --- old/yast2-bootloader-3.1.105/src/clients/bootloader_finish.rb 2014-10-16 08:02:11.000000000 +0200 +++ new/yast2-bootloader-3.1.108/src/clients/bootloader_finish.rb 2014-10-29 15:32:14.000000000 +0100 @@ -167,6 +167,25 @@ @retcode = Bootloader.WriteInstallation else @retcode = Bootloader.Update + + # workaround for packages that forgot to update initrd(bnc#889616) + # do not use Initrd module as it can also change configuration, which we do not want + res = SCR.Execute(path(".target.bash_output"), "/sbin/mkinitrd") + Builtins.y2milestone("Regerate initrd with result #{res}") + end + + # FIXME workaround grub2 need manual rerun of branding due to overwrite by + # pbl. see bnc#879686 and bnc#901003 + if Bootloader.getLoaderType =~ /grub2/ + prefix = Installation.destdir + branding_activator = Dir["#{prefix}/usr/share/grub2/themes/*/activate-theme"].first + if branding_activator + branding_activator = branding_activator[prefix.size..-1] + res = SCR.Execute(path(".target.bash_output"), branding_activator) + Builtins.y2milestone("Reactivate branding with #{branding_activator} and result #{res}") + res = SCR.Execute(path(".target.bash_output"), "/usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg") + Builtins.y2milestone("Regenerating config for branding with result #{res}") + end end if @retcode @@ -185,8 +204,7 @@ # (bnc #381192) don't use it if kexec is used # update calling onetime boot bnc #339024 if !@retcode - @bl = Bootloader.getLoaderType - return Bootloader.FlagOnetimeBoot(Bootloader.getDefaultSection) + @ret = Bootloader.FlagOnetimeBoot(Bootloader.getDefaultSection) end else return @retcode @@ -196,25 +214,6 @@ @ret = nil end - # FIXME workaround grub2 need manual rerun of branding due to overwrite by - # pbl. see bnc#879686 and bnc#901003 - if Bootloader.getLoaderType =~ /grub2/ - prefix = Installation.destdir - branding_activator = Dir["#{prefix}/usr/share/grub2/themes/*/activate-theme"].first - if branding_activator - branding_activator = branding_activator[prefix.size..-1] - res = SCR.Execute(path(".target.bash_output"), branding_activator) - Builtins.y2milestone("Reactivate branding with #{branding_activator} and result #{res}") - end - end - # workaround for packages that forgot to update initrd(bnc#889616) - # do not use Initrd module as it can also change configuration, which we do not want - if Mode.update - res = SCR.Execute(path(".target.bash_output"), "/sbin/mkinitrd") - Builtins.y2milestone("Regerate initrd with result #{res}") - end - - Builtins.y2debug("ret=%1", @ret) Builtins.y2milestone("bootloader_finish finished") deep_copy(@ret) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.105/src/include/bootloader/grub2/misc.rb new/yast2-bootloader-3.1.108/src/include/bootloader/grub2/misc.rb --- old/yast2-bootloader-3.1.105/src/include/bootloader/grub2/misc.rb 2014-10-16 08:02:11.000000000 +0200 +++ new/yast2-bootloader-3.1.108/src/include/bootloader/grub2/misc.rb 2014-10-29 15:32:14.000000000 +0100 @@ -395,7 +395,7 @@ bldevs = BootCommon.GetBootloaderDevices need_location_reconfigure = false - if bldevs == nil || bldevs == ["/dev/null"] + if bldevs.empty? need_location_reconfigure = true else Builtins.foreach(bldevs) do |dev| diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.105/src/include/bootloader/routines/misc.rb new/yast2-bootloader-3.1.108/src/include/bootloader/routines/misc.rb --- old/yast2-bootloader-3.1.105/src/include/bootloader/routines/misc.rb 2014-10-16 08:02:11.000000000 +0200 +++ new/yast2-bootloader-3.1.108/src/include/bootloader/routines/misc.rb 2014-10-29 15:32:14.000000000 +0100 @@ -145,9 +145,9 @@ if @globals["boot_custom"] ret << @globals["boot_custom"] end - return ret unless ret.empty? - # FIXME: find out what the best value is here: nil, [] or ["/dev/null"] - ["/dev/null"] + Builtins.y2warning("Empty bootloader devices. Globals #{(a)globals.inspect}") if ret.empty? + + ret end # get kernel parameter from kernel command line @@ -158,6 +158,8 @@ def getKernelParamFromLine(line, key) # FIXME this doesn't work with quotes and spaces res = "false" + # we can get nil if params is not yet proposed, so return not there (bnc#902397) + return res unless line params = line.split(" ").reject(&:empty?) params.each do |p| l = p.split("=") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.105/src/modules/BootGRUB2.rb new/yast2-bootloader-3.1.108/src/modules/BootGRUB2.rb --- old/yast2-bootloader-3.1.105/src/modules/BootGRUB2.rb 2014-10-16 08:02:11.000000000 +0200 +++ new/yast2-bootloader-3.1.108/src/modules/BootGRUB2.rb 2014-10-29 15:32:14.000000000 +0100 @@ -229,7 +229,7 @@ line << "</li>" end - if ["boot_root", "boot_boot", "boot_mbr"].none? { |loc| BootCommon.globals[loc] == "true" } + if ["boot_root", "boot_boot", "boot_mbr", "boot_extended"].none? { |loc| BootCommon.globals[loc] == "true" } # no location chosen, so warn user that it is problem unless he is sure msg = _("Warning: No location for bootloader stage1 selected." \ "Unless you know what you are doing please select above location.") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.105/src/modules/Bootloader.rb new/yast2-bootloader-3.1.108/src/modules/Bootloader.rb --- old/yast2-bootloader-3.1.105/src/modules/Bootloader.rb 2014-10-16 08:02:11.000000000 +0200 +++ new/yast2-bootloader-3.1.108/src/modules/Bootloader.rb 2014-10-29 15:32:14.000000000 +0100 @@ -934,7 +934,7 @@ WFM.Execute(path(".local.mkdir"), "/var/lib/YaST2") cmd = Builtins.sformat( - "/bin/cp -L %1%2 %1%3 %4", + "/bin/cp -L %1/%2 %1/%3 %4", Installation.destdir, "vmlinuz", "initrd", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.105/test/data/storage_encrypted.rb new/yast2-bootloader-3.1.108/test/data/storage_encrypted.rb --- old/yast2-bootloader-3.1.105/test/data/storage_encrypted.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-3.1.108/test/data/storage_encrypted.rb 2014-10-29 15:32:14.000000000 +0100 @@ -0,0 +1,157 @@ +{ + "/dev/sda" => { + "bios_id" => "0x80", + "bus" => "IDE", + "cyl_count" => 1827, + "cyl_size" => 8225280, + "device" => "/dev/sda", + "driver" => "ahci", + "driver_module" => "ahci", + "label" => "msdos", + "max_logical" => 255, + "max_primary" => 4, + "model" => "HARDDISK", + "name" => "sda", + "partitions" => [ + { + "create" => true, + "crypt_device" => "/dev/mapper/cr_swap", + "detected_fs" => :swap, + "device" => "/dev/sda1", + "enc_type" => :luks, + "format" => true, + "fsid" => 130, + "fstopt" => "defaults", + "fstype" => "Linux swap", + "inactive" => true, + "mount" => "swap", + "mountby" => :device, + "name" => "sda1", + "nr" => 1, + "region" => [0, 261], + "size_k" => 2096482, + "type" => :primary, + "udev_id" => [ + "ata-VBOX_HARDDISK_VB7c7aa34e-2f09570d-part1", + "scsi-0ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part1", + "scsi-1ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part1", + "scsi-SATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part1" + ], + "udev_path" => "pci-0000:00:0d.0-ata-1.0-part1", + "used_by_device" => "", + "used_by_type" => :UB_NONE, + "used_fs" => :swap + }, + { + "create" => true, + "detected_fs" => :unknown, + "device" => "/dev/sda2", + "format" => true, + "fs_options" => { + "opt_dir_index" => { + "option_cmd" => :mkfs, + "option_str" => "-O dir_index", + "option_value" => true + }, + "opt_reg_checks" => { + "option_cmd" => :tunefs, + "option_str" => "-c 0 -i 0", + "option_value" => true + }, + "opt_reserved_blocks" => { + "option_cmd" => :mkfs, + "option_str" => "-m", + "option_value" => "5.0" + } + }, + "fsid" => 131, + "fstopt" => "acl,user_xattr", + "fstype" => "Linux native", + "inactive" => true, + "mkfs_opt" => "-O dir_index -m5.0", + "mount" => "/boot", + "mountby" => :uuid, + "name" => "sda2", + "nr" => 2, + "region" => [261, 25], + "size_k" => 200812, + "tunefs_opt" => "-c 0 -i 0", + "type" => :primary, + "udev_id" => [ + "ata-VBOX_HARDDISK_VB7c7aa34e-2f09570d-part2", + "scsi-0ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part2", + "scsi-1ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part2", + "scsi-SATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part2" + ], + "udev_path" => "pci-0000:00:0d.0-ata-1.0-part2", + "used_by_device" => "", + "used_by_type" => :UB_NONE, + "used_fs" => :ext4, + "userdata" => { "/" => "snapshots" } + }, + { + "create" => true, + "detected_fs" => :unknown, + "device" => "/dev/sda3", + "format" => true, + "fs_options" => { + "opt_dir_index" => { + "option_cmd" => :mkfs, + "option_str" => "-O dir_index", + "option_value" => true + }, + "opt_reg_checks" => { + "option_cmd" => :tunefs, + "option_str" => "-c 0 -i 0", + "option_value" => true + }, + "opt_reserved_blocks" => { + "option_cmd" => :mkfs, + "option_str" => "-m", + "option_value" => "5.0" + } + }, + "fsid" => 131, + "fstopt" => "acl,user_xattr", + "fstype" => "Linux native", + "inactive" => true, + "mkfs_opt" => "-O dir_index -m5.0", + "mount" => "/", + "mountby" => :uuid, + "name" => "sda3", + "nr" => 3, + "region" => [286, 1540], + "size_k" => 12370050, + "tunefs_opt" => "-c 0 -i 0", + "type" => :primary, + "udev_id" => [ + "ata-VBOX_HARDDISK_VB7c7aa34e-2f09570d-part3", + "scsi-0ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part3", + "scsi-1ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part3", + "scsi-SATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d-part3" + ], + "udev_path" => "pci-0000:00:0d.0-ata-1.0-part3", + "used_by_device" => "", + "used_by_type" => :UB_NONE, + "used_fs" => :ext4, + "userdata" => { "/" => "snapshots" } + } + ], + "proposal_name" => "1. IDE Disk, 14.00 GiB, /dev/sda, VBOX-HARDDISK", + "sector_size" => 512, + "size_k" => 14680064, + "transport" => :sata, + "type" => :CT_DISK, + "udev_id" => [ + "ata-VBOX_HARDDISK_VB7c7aa34e-2f09570d", + "scsi-0ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d", + "scsi-1ATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d", + "scsi-SATA_VBOX_HARDDISK_VB7c7aa34e-2f09570d" + ], + "udev_path" => "pci-0000:00:0d.0-ata-1.0", + "unique" => "3OOL.LBw4GrqrKS7", + "used_by_device" => "", + "used_by_type" => :UB_NONE, + "vendor" => "VBOX" + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.105/test/device_mapping_test.rb new/yast2-bootloader-3.1.108/test/device_mapping_test.rb --- old/yast2-bootloader-3.1.105/test/device_mapping_test.rb 2014-10-16 08:02:11.000000000 +0200 +++ new/yast2-bootloader-3.1.108/test/device_mapping_test.rb 2014-10-29 15:32:14.000000000 +0100 @@ -49,6 +49,9 @@ when "/dev/system/root" disk = "/dev/system" number = "system" + when "/dev/mapper/cr_swap" + disk = "/dev/mapper/cr_swap" + number = "" when "tmpfs" disk = "tmpfs" number = "" @@ -74,6 +77,13 @@ expect(subject.to_mountby_device("/dev/vda2")).to eq "/dev/disk/by-uuid/ec8e9948-ca5f-4b18-a863-ac999365e4a9" end + it "returns encrypted device name if device have it" do + target_map_stub("storage_encrypted.rb") + allow(Yast::Storage).to receive(:GetDefaultMountBy).and_return(:uuid) + + expect(subject.to_mountby_device("/dev/mapper/cr_swap")).to eq "/dev/mapper/cr_swap" + end + it "returns kernel device name if requested udev mapping do not exists" do target_map_stub("storage_lvm.rb") expect(Yast::Storage).to receive(:GetDefaultMountBy).and_return(:id) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.105/test/mbr_update_test.rb new/yast2-bootloader-3.1.108/test/mbr_update_test.rb --- old/yast2-bootloader-3.1.105/test/mbr_update_test.rb 2014-10-16 08:02:11.000000000 +0200 +++ new/yast2-bootloader-3.1.108/test/mbr_update_test.rb 2014-10-29 15:32:14.000000000 +0100 @@ -64,11 +64,6 @@ receive(:new).with("/dev/sda").and_return(backup_mock) ) expect(backup_mock).to receive(:write) - #FIXME avoid stupid /dev/null behavior - expect(::Bootloader::BootRecordBackup).to( - receive(:new).with("/dev/null"). - and_return(double(:write => true)) - ) subject.run end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit osc for openSUSE:Factory
by root＠hilbert.suse.de 29 Oct '14

29 Oct '14

Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2014-10-29 21:10:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osc" Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2014-10-18 09:10:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.osc.new/osc.changes 2014-10-29 21:11:38.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Oct 21 09:57:27 UTC 2014 - suse-tux(a)gmx.de + +- 0.149 + - removed "--diff" option from the "createrequest" command + - introduced new "vc-cmd" config option, which is used to specify the path + to the vc script + - various bugfixes + +------------------------------------------------------------------- Old: ---- osc-0.148.2.tar.gz New: ---- osc-0.149.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.HPc68d/_old 2014-10-29 21:11:39.000000000 +0100 +++ /var/tmp/diff_new_pack.HPc68d/_new 2014-10-29 21:11:39.000000000 +0100 @@ -17,7 +17,7 @@ Name: osc -Version: 0.148.2 +Version: 0.149.0 Release: 0 Summary: openSUSE Build Service Commander License: GPL-2.0+ ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.HPc68d/_old 2014-10-29 21:11:39.000000000 +0100 +++ /var/tmp/diff_new_pack.HPc68d/_new 2014-10-29 21:11:39.000000000 +0100 @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.148.2 +pkgver=0.149.0 pkgrel=0 pkgdesc="Open Build Service client" arch=('i686' 'x86_64') @@ -8,7 +8,7 @@ groups=('base-devel') depends=('python2' 'python2-m2crypto' 'urlgrabber') source=(osc-${pkgver}.tar.gz) -md5sums=('c179c0ab4f710633445dbb5604c9c73a') +md5sums=('3c31fb9a5c5bd6f9c05d72380fabfef1') package() { msg "Installing osc ..." ++++++ _service ++++++ --- /var/tmp/diff_new_pack.HPc68d/_old 2014-10-29 21:11:39.000000000 +0100 +++ /var/tmp/diff_new_pack.HPc68d/_new 2014-10-29 21:11:39.000000000 +0100 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">0.148.2</param> - <param name="revision">0.148</param> + <param name="version">0.149.0</param> + <param name="revision">0.149.0</param> <param name="url">git://github.com/openSUSE/osc.git</param> <param name="scm">git</param> </service> ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.HPc68d/_old 2014-10-29 21:11:39.000000000 +0100 +++ /var/tmp/diff_new_pack.HPc68d/_new 2014-10-29 21:11:39.000000000 +0100 @@ -1,4 +1,4 @@ -osc (0.148.2) unstable; urgency=low +osc (0.149.0) unstable; urgency=low - Update to 0.135.0 -- Adrian Schroeter <adrian(a)suse.de> Wed, 28 Jun 2012 10:00:00 +0200 ++++++ debian.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/rules new/debian/rules --- old/debian/rules 2010-01-28 17:02:02.000000000 +0100 +++ new/debian/rules 2014-10-24 12:41:45.000000000 +0200 @@ -100,7 +100,7 @@ dh_compress dh_fixperms # dh_perl - dh_python +# dh_python # dh_makeshlibs dh_installdeb dh_shlibdeps ++++++ osc-0.148.2.tar.gz -> osc-0.149.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/osc/osc-0.148.2.tar.gz /work/SRC/openSUSE:Factory/.osc.new/osc-0.149.0.tar.gz differ: char 5, line 1 ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.HPc68d/_old 2014-10-29 21:11:39.000000000 +0100 +++ /var/tmp/diff_new_pack.HPc68d/_new 2014-10-29 21:11:39.000000000 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.148.2 +Version: 0.149.0 Binary: osc Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: any -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-experimental for openSUSE:Factory
by root＠hilbert.suse.de 29 Oct '14

29 Oct '14

Hello community, here is the log from the commit of package perl-experimental for openSUSE:Factory checked in at 2014-10-29 21:10:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-experimental (Old) and /work/SRC/openSUSE:Factory/.perl-experimental.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-experimental" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-experimental/perl-experimental.changes 2014-10-15 16:21:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-experimental.new/perl-experimental.changes 2014-10-29 21:11:36.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Oct 27 09:25:44 UTC 2014 - ncutler(a)suse.com + +- updated to 0.013 + +------------------------------------------------------------------- +Mon Oct 27 09:24:24 UTC 2014 - ncutler(a)suse.com + +Upstream changes +- 0.013 Rename lvalue_refs to refaliasing + +------------------------------------------------------------------- Old: ---- experimental-0.012.tar.gz New: ---- experimental-0.013.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-experimental.spec ++++++ --- /var/tmp/diff_new_pack.i5HnsY/_old 2014-10-29 21:11:38.000000000 +0100 +++ /var/tmp/diff_new_pack.i5HnsY/_new 2014-10-29 21:11:38.000000000 +0100 @@ -17,7 +17,7 @@ Name: perl-experimental -Version: 0.012 +Version: 0.013 Release: 0 %define cpan_name experimental Summary: Experimental features made easy @@ -29,7 +29,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(Module::Build::Tiny) >= 0.036 +BuildRequires: perl(Module::Build::Tiny) >= 0.039 BuildRequires: perl(Test::More) >= 0.89 BuildRequires: perl(feature) BuildRequires: perl(version) @@ -65,6 +65,7 @@ lexical_topic - allow the use of lexical $_ via "my $_" postderef - allow the use of postfix dereferencing expressions, including in interpolating strings + refaliasing - allow aliasing via \$x = \$y regex_sets - allow extended bracketed character classes in regexps signatures - allow subroutine signatures (for named arguments) smartmatch - allow the use of ~~ ++++++ experimental-0.012.tar.gz -> experimental-0.013.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/experimental-0.012/Build.PL new/experimental-0.013/Build.PL --- old/experimental-0.012/Build.PL 2014-10-12 12:10:21.000000000 +0200 +++ new/experimental-0.013/Build.PL 2014-10-25 21:54:55.000000000 +0200 @@ -1,4 +1,7 @@ -# This Build.PL for experimental was generated by Dist::Zilla::Plugin::ModuleBuildTiny 0.006. +# This Build.PL for experimental was generated by Dist::Zilla::Plugin::ModuleBuildTiny 0.007. +use strict; +use warnings; + use 5.010; -use Module::Build::Tiny 0.038; +use Module::Build::Tiny 0.039; Build_PL(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/experimental-0.012/Changes new/experimental-0.013/Changes --- old/experimental-0.012/Changes 2014-10-12 12:10:21.000000000 +0200 +++ new/experimental-0.013/Changes 2014-10-25 21:54:55.000000000 +0200 @@ -1,5 +1,8 @@ Revision history for experimental +0.013 2014-10-25 21:54:47+02:00 Europe/Amsterdam + Rename lvalue_refs to refaliasing + 0.012 2014-10-12 12:10:06+02:00 Europe/Amsterdam Added lvalue references feature diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/experimental-0.012/MANIFEST new/experimental-0.013/MANIFEST --- old/experimental-0.012/MANIFEST 2014-10-12 12:10:21.000000000 +0200 +++ new/experimental-0.013/MANIFEST 2014-10-25 21:54:55.000000000 +0200 @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.020. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.021. Build.PL Changes INSTALL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/experimental-0.012/META.json new/experimental-0.013/META.json --- old/experimental-0.012/META.json 2014-10-12 12:10:21.000000000 +0200 +++ new/experimental-0.013/META.json 2014-10-25 21:54:55.000000000 +0200 @@ -4,7 +4,7 @@ "Leon Timmermans <leont(a)cpan.org>" ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 5.020, CPAN::Meta::Converter version 2.142060", + "generated_by" : "Dist::Zilla version 5.021, CPAN::Meta::Converter version 2.142690", "license" : [ "perl_5" ], @@ -16,7 +16,7 @@ "prereqs" : { "configure" : { "requires" : { - "Module::Build::Tiny" : "0.038" + "Module::Build::Tiny" : "0.039" } }, "develop" : { @@ -49,7 +49,7 @@ "provides" : { "experimental" : { "file" : "lib/experimental.pm", - "version" : "0.012" + "version" : "0.013" } }, "release_status" : "stable", @@ -64,6 +64,6 @@ "web" : "https://github.com/Leont/experimental" } }, - "version" : "0.012" + "version" : "0.013" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/experimental-0.012/META.yml new/experimental-0.013/META.yml --- old/experimental-0.012/META.yml 2014-10-12 12:10:21.000000000 +0200 +++ new/experimental-0.013/META.yml 2014-10-25 21:54:55.000000000 +0200 @@ -9,9 +9,9 @@ Test::More: '0.89' perl: '5.010' configure_requires: - Module::Build::Tiny: '0.038' + Module::Build::Tiny: '0.039' dynamic_config: 0 -generated_by: 'Dist::Zilla version 5.020, CPAN::Meta::Converter version 2.142060' +generated_by: 'Dist::Zilla version 5.021, CPAN::Meta::Converter version 2.142690' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -20,7 +20,7 @@ provides: experimental: file: lib/experimental.pm - version: '0.012' + version: '0.013' requires: Carp: '0' feature: '0' @@ -31,4 +31,4 @@ resources: bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=experimental repository: git://github.com/Leont/experimental.git -version: '0.012' +version: '0.013' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/experimental-0.012/README new/experimental-0.013/README --- old/experimental-0.012/README 2014-10-12 12:10:21.000000000 +0200 +++ new/experimental-0.013/README 2014-10-25 21:54:55.000000000 +0200 @@ -1,7 +1,7 @@ This archive contains the distribution experimental, -version 0.012: +version 0.013: Experimental features made easy @@ -11,5 +11,5 @@ the same terms as the Perl 5 programming language system itself. -This README file was generated by Dist::Zilla::Plugin::Readme v5.020. +This README file was generated by Dist::Zilla::Plugin::Readme v5.021. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/experimental-0.012/lib/experimental.pm new/experimental-0.013/lib/experimental.pm --- old/experimental-0.012/lib/experimental.pm 2014-10-12 12:10:21.000000000 +0200 +++ new/experimental-0.013/lib/experimental.pm 2014-10-25 21:54:55.000000000 +0200 @@ -1,5 +1,5 @@ package experimental; -$experimental::VERSION = '0.012'; +$experimental::VERSION = '0.013'; use strict; use warnings; use version (); @@ -25,9 +25,9 @@ fc => '5.16.0', lexical_topic => '5.10.0', lexical_subs => '5.18.0', - lvalue_refs => '5.21.5', postderef => '5.20.0', postderef_qq => '5.20.0', + refaliasing => '5.21.5', regex_sets => '5.18.0', say => '5.10.0', smartmatch => '5.10.0', @@ -119,7 +119,7 @@ =head1 VERSION -version 0.012 +version 0.013 =head1 SYNOPSIS @@ -153,9 +153,9 @@ array_base - allow the use of $[ to change the starting index of @array autoderef - allow push, each, keys, and other built-ins on references lexical_topic - allow the use of lexical $_ via "my $_" - lvalue_refs - allow aliasing via \$x = \$y postderef - allow the use of postfix dereferencing expressions, including in interpolating strings + refaliasing - allow aliasing via \$x = \$y regex_sets - allow extended bracketed character classes in regexps signatures - allow subroutine signatures (for named arguments) smartmatch - allow the use of ~~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/experimental-0.012/t/00-compile.t new/experimental-0.013/t/00-compile.t --- old/experimental-0.012/t/00-compile.t 2014-10-12 12:10:21.000000000 +0200 +++ new/experimental-0.013/t/00-compile.t 2014-10-25 21:54:55.000000000 +0200 @@ -2,11 +2,11 @@ use strict; use warnings; -# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.040 - -use Test::More tests => 1 + ($ENV{AUTHOR_TESTING} ? 1 : 0); +# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.051 +use Test::More; +plan tests => 1 + ($ENV{AUTHOR_TESTING} ? 1 : 0); my @module_files = ( 'experimental.pm' @@ -45,6 +45,7 @@ -is(scalar(@warnings), 0, 'no warnings found') if $ENV{AUTHOR_TESTING}; +is(scalar(@warnings), 0, 'no warnings found') + or diag 'got warnings: ', ( Test::More->can('explain') ? Test::More::explain(\@warnings) : join("\n", '', @warnings) ) if $ENV{AUTHOR_TESTING}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/experimental-0.012/t/basic.t new/experimental-0.013/t/basic.t --- old/experimental-0.012/t/basic.t 2014-10-12 12:10:21.000000000 +0200 +++ new/experimental-0.013/t/basic.t 2014-10-25 21:54:55.000000000 +0200 @@ -51,8 +51,8 @@ } if ($] >= 5.021005) { - is (eval <<'END', 1, 'lvalue ref compiles') or diag $@; - use experimental 'lvalue_refs'; + is (eval <<'END', 1, 'ref aliasing compiles') or diag $@; + use experimental 'refaliasing'; \@a = \@b; is(\@a, \@b, '@a and @b are the same after \@a=\@b'); 1; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Module-Build-Tiny for openSUSE:Factory
by root＠hilbert.suse.de 29 Oct '14

29 Oct '14

Hello community, here is the log from the commit of package perl-Module-Build-Tiny for openSUSE:Factory checked in at 2014-10-29 21:10:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Module-Build-Tiny (Old) and /work/SRC/openSUSE:Factory/.perl-Module-Build-Tiny.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Module-Build-Tiny" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Module-Build-Tiny/perl-Module-Build-Tiny.changes 2014-09-15 18:25:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Module-Build-Tiny.new/perl-Module-Build-Tiny.changes 2014-10-29 21:11:35.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 27 09:28:46 UTC 2014 - ncutler(a)suse.com + +- updated to 0.039 + * Supply basename to *.PL files as its args + +------------------------------------------------------------------- Old: ---- Module-Build-Tiny-0.038.tar.gz New: ---- Module-Build-Tiny-0.039.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Module-Build-Tiny.spec ++++++ --- /var/tmp/diff_new_pack.HAwWZK/_old 2014-10-29 21:11:36.000000000 +0100 +++ /var/tmp/diff_new_pack.HAwWZK/_new 2014-10-29 21:11:36.000000000 +0100 @@ -17,7 +17,7 @@ Name: perl-Module-Build-Tiny -Version: 0.038 +Version: 0.039 Release: 0 %define cpan_name Module-Build-Tiny Summary: A tiny replacement for Module::Build ++++++ Module-Build-Tiny-0.038.tar.gz -> Module-Build-Tiny-0.039.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-Tiny-0.038/Changes new/Module-Build-Tiny-0.039/Changes --- old/Module-Build-Tiny-0.038/Changes 2014-09-06 11:28:46.000000000 +0200 +++ new/Module-Build-Tiny-0.039/Changes 2014-10-12 10:39:04.000000000 +0200 @@ -1,5 +1,8 @@ Revision history for Module::Build::Tiny +0.039 2014-10-12 10:38:39+02:00 Europe/Amsterdam + Supply basename to *.PL files as its args + 0.038 2014-09-06 11:28:23+02:00 Europe/Amsterdam Scrub PERL_MB_OPT in tests too diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-Tiny-0.038/MANIFEST new/Module-Build-Tiny-0.039/MANIFEST --- old/Module-Build-Tiny-0.038/MANIFEST 2014-09-06 11:28:46.000000000 +0200 +++ new/Module-Build-Tiny-0.039/MANIFEST 2014-10-12 10:39:04.000000000 +0200 @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.019. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.020. Build.PL Changes INSTALL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-Tiny-0.038/META.json new/Module-Build-Tiny-0.039/META.json --- old/Module-Build-Tiny-0.038/META.json 2014-09-06 11:28:46.000000000 +0200 +++ new/Module-Build-Tiny-0.039/META.json 2014-10-12 10:39:04.000000000 +0200 @@ -5,7 +5,7 @@ "David Golden <dagolden(a)cpan.org>" ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 5.019, CPAN::Meta::Converter version 2.142060", + "generated_by" : "Dist::Zilla version 5.020, CPAN::Meta::Converter version 2.142060", "license" : [ "perl_5" ], @@ -99,7 +99,7 @@ "provides" : { "Module::Build::Tiny" : { "file" : "lib/Module/Build/Tiny.pm", - "version" : "0.038" + "version" : "0.039" } }, "release_status" : "stable", @@ -114,6 +114,6 @@ "web" : "https://github.com/Leont/module-build-tiny" } }, - "version" : "0.038" + "version" : "0.039" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-Tiny-0.038/META.yml new/Module-Build-Tiny-0.039/META.yml --- old/Module-Build-Tiny-0.038/META.yml 2014-09-06 11:28:46.000000000 +0200 +++ new/Module-Build-Tiny-0.039/META.yml 2014-10-12 10:39:04.000000000 +0200 @@ -42,7 +42,7 @@ conflicts: local::lib: '< 1.006008' dynamic_config: 0 -generated_by: 'Dist::Zilla version 5.019, CPAN::Meta::Converter version 2.142060' +generated_by: 'Dist::Zilla version 5.020, CPAN::Meta::Converter version 2.142060' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -51,7 +51,7 @@ provides: Module::Build::Tiny: file: lib/Module/Build/Tiny.pm - version: '0.038' + version: '0.039' requires: CPAN::Meta: '0' DynaLoader: '0' @@ -76,4 +76,4 @@ resources: bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=Module-Build-Tiny repository: git://github.com/Leont/module-build-tiny.git -version: '0.038' +version: '0.039' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-Tiny-0.038/README new/Module-Build-Tiny-0.039/README --- old/Module-Build-Tiny-0.038/README 2014-09-06 11:28:46.000000000 +0200 +++ new/Module-Build-Tiny-0.039/README 2014-10-12 10:39:04.000000000 +0200 @@ -1,7 +1,7 @@ This archive contains the distribution Module-Build-Tiny, -version 0.038: +version 0.039: A tiny replacement for Module::Build @@ -11,5 +11,5 @@ the same terms as the Perl 5 programming language system itself. -This README file was generated by Dist::Zilla::Plugin::Readme v5.019. +This README file was generated by Dist::Zilla::Plugin::Readme v5.020. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Module-Build-Tiny-0.038/lib/Module/Build/Tiny.pm new/Module-Build-Tiny-0.039/lib/Module/Build/Tiny.pm --- old/Module-Build-Tiny-0.038/lib/Module/Build/Tiny.pm 2014-09-06 11:28:46.000000000 +0200 +++ new/Module-Build-Tiny-0.039/lib/Module/Build/Tiny.pm 2014-10-12 10:39:04.000000000 +0200 @@ -1,5 +1,5 @@ package Module::Build::Tiny; -$Module::Build::Tiny::VERSION = '0.038'; +$Module::Build::Tiny::VERSION = '0.039'; use strict; use warnings; use Exporter 5.57 'import'; @@ -81,7 +81,10 @@ my %actions = ( build => sub { my %opt = @_; - system $^X, $_ and die "$_ returned $?\n" for find(qr/\.PL$/, 'lib'); + for my $pl_file (find(qr/\.PL$/, 'lib')) { + (my $pm = $pl_file) =~ s/\.PL$//; + system $^X, $pl_file, $pm and die "$pl_file returned $?\n"; + } my %modules = map { $_ => catfile('blib', $_) } find(qr/\.p(?:m|od)$/, 'lib'); my %scripts = map { $_ => catfile('blib', $_) } find(qr//, 'script'); my %shared = map { $_ => catfile(qw/blib lib auto share dist/, $opt{meta}->name, abs2rel($_, 'share')) } find(qr//, 'share'); @@ -166,7 +169,7 @@ =head1 VERSION -version 0.038 +version 0.039 =head1 SYNOPSIS -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_8_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 29 Oct '14

29 Oct '14

1 0

commit pixz for openSUSE:Factory
by root＠hilbert.suse.de 29 Oct '14

29 Oct '14

Hello community, here is the log from the commit of package pixz for openSUSE:Factory checked in at 2014-10-29 21:10:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pixz (Old) and /work/SRC/openSUSE:Factory/.pixz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pixz" Changes: -------- --- /work/SRC/openSUSE:Factory/pixz/pixz.changes 2013-12-18 07:51:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pixz.new/pixz.changes 2014-10-29 21:11:31.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Oct 28 23:33:20 UTC 2014 - andreas.stieger(a)gmx.de + +- support build on CentOS 7 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pixz.spec ++++++ --- /var/tmp/diff_new_pack.pRiBaF/_old 2014-10-29 21:11:32.000000000 +0100 +++ /var/tmp/diff_new_pack.pRiBaF/_new 2014-10-29 21:11:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pixz # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%if 0%{?centos_version} || 0%{?rhel_version} +%if ( 0%{?centos_version} && 0%{?centos_version} <= 600 ) || 0%{?rhel_version} %define use_static_libs 1 %define patch_missing_endianess_functions 1 %else -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fontinfo for openSUSE:Factory
by root＠hilbert.suse.de 29 Oct '14

29 Oct '14

Hello community, here is the log from the commit of package fontinfo for openSUSE:Factory checked in at 2014-10-29 21:10:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fontinfo (Old) and /work/SRC/openSUSE:Factory/.fontinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fontinfo" Changes: -------- --- /work/SRC/openSUSE:Factory/fontinfo/fontinfo.changes 2014-06-18 07:53:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fontinfo.new/fontinfo.changes 2014-10-29 21:11:30.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Oct 29 07:46:21 UTC 2014 - pgajdos(a)suse.com + +- updated to version 20141029 + * 1-click install for 13.2 and sle12 + +------------------------------------------------------------------- Old: ---- fontinfo-20140609.tar.bz2 New: ---- fontinfo-20141029.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontinfo.spec ++++++ --- /var/tmp/diff_new_pack.d3sThr/_old 2014-10-29 21:11:31.000000000 +0100 +++ /var/tmp/diff_new_pack.d3sThr/_new 2014-10-29 21:11:31.000000000 +0100 @@ -17,7 +17,7 @@ Name: fontinfo -Version: 20140609 +Version: 20141029 Release: 0 Summary: Overview of Installed Fonts License: GPL-2.0+ ++++++ fontinfo-20140609.tar.bz2 -> fontinfo-20141029.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20140609/CHANGES new/fontinfo-20141029/CHANGES --- old/fontinfo-20140609/CHANGES 2014-06-09 12:05:13.000000000 +0200 +++ new/fontinfo-20141029/CHANGES 2014-10-29 08:49:07.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 29 07:46:21 UTC 2014 - pgajdos(a)suse.com + +Version 20141029 + * 1-click install for 13.2 and sle12 + +------------------------------------------------------------------- Mon Jun 9 09:35:24 UTC 2014 - pgajdos(a)suse.com Version 20140609 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20140609/Makefile new/fontinfo-20141029/Makefile --- old/fontinfo-20140609/Makefile 2014-06-09 12:05:13.000000000 +0200 +++ new/fontinfo-20141029/Makefile 2014-10-29 08:49:07.000000000 +0100 @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. DIRS = languages -VERSION = 20140609 +VERSION = 20141029 PKGMAN_CFLAGS = $(shell sh ./package-manager.sh --cflags) PKGMAN_LIBS = $(shell sh ./package-manager.sh --libs) LIBPNG_CFLAGS = $(shell pkg-config --cflags libpng) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20140609/bento-style.c new/fontinfo-20141029/bento-style.c --- old/fontinfo-20140609/bento-style.c 2014-06-09 12:05:13.000000000 +0200 +++ new/fontinfo-20141029/bento-style.c 2014-10-29 08:49:07.000000000 +0100 @@ -655,7 +655,6 @@ fprintf(html, " </td>\n"); - fprintf(stderr, "%s: %s => %s\n", file, pi.name, filename); if (config.install_type == YMP && pi.name[0]) { generate_ymp(config, pi.name, filename); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20140609/fontinfo-suse.sh new/fontinfo-20141029/fontinfo-suse.sh --- old/fontinfo-20140609/fontinfo-suse.sh 2014-06-09 12:05:13.000000000 +0200 +++ new/fontinfo-20141029/fontinfo-suse.sh 2014-10-29 08:49:07.000000000 +0100 @@ -21,8 +21,8 @@ -y bento \ -n ymp \ -g \ - -r 'openSUSE 13.2,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_Factory' \ - -r 'SUSE Linux Enterprise Server 12,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_Factory' \ + -r 'openSUSE 13.2,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_13.2' \ + -r 'SUSE Linux Enterprise Server 12,http://download.opensuse.org/repositories/M17N:/fonts/SLE_12' \ -r 'SUSE Linux Enterprise Desktop 12,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_Factory' \ -r 'openSUSE 13.1,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_13.1' \ -r 'openSUSE 12.3,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_12.3' \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20140609/hbz.c new/fontinfo-20141029/hbz.c --- old/fontinfo-20140609/hbz.c 2014-06-09 12:05:13.000000000 +0200 +++ new/fontinfo-20141029/hbz.c 2014-10-29 08:49:07.000000000 +0100 @@ -69,8 +69,6 @@ hb_ft_font = hb_ft_font_create(face, NULL); hb_buf = hb_buffer_create(); - //fprintf(stderr, "[%s] [%s] %x %x\n", script, lang, HB_TAG('A', 'r', 'a', 'b'), unicode_script_tag(script)); - hb_buffer_set_direction(hb_buf, hbz_direction(dir)); if (script && script[0]) hb_buffer_set_script(hb_buf, unicode_script_tag(script)); @@ -98,7 +96,6 @@ *advances_sum_x = *advances_sum_y = 0; for (g = 0; g < glyph_count; g++) { - //fprintf(stdout, "0x%x ", hb_glyph_infos[g].codepoint); /* for bitmap font there can be no coverage of certain script for certain size */ if (hb_glyph_infos[g].codepoint == 0) @@ -111,7 +108,6 @@ *advances_sum_x += (*glyph_advances)[g].x; *advances_sum_y += (*glyph_advances)[g].y; } - //fprintf(stdout, "\n"); hb_buffer_destroy(hb_buf); hb_font_destroy(hb_ft_font); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit crmsh for openSUSE:Factory
by root＠hilbert.suse.de 29 Oct '14

29 Oct '14

Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2014-10-29 21:10:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2014-10-18 09:10:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-10-29 21:11:28.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Oct 28 22:54:01 UTC 2014 - kgronlund(a)suse.com + +- Pre-release 2.2.0-rc1 +- Updated changelog + +------------------------------------------------------------------- +Tue Oct 28 20:56:39 UTC 2014 - kgronlund(a)suse.com + +- medium: ui_resource: Only act on resources (#64) +- medium: ui_resource: Flatten, then filter (#64) +- high: ui_resource: Use correct name for error function (bnc#901453) +- high: ui_resource: resource trace failed if operation existed (bnc#901453) +- upstream cs: 2.1.0-114-gd51bf56 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.ypr63I/_old 2014-10-29 21:11:29.000000000 +0100 +++ /var/tmp/diff_new_pack.ypr63I/_new 2014-10-29 21:11:29.000000000 +0100 @@ -41,7 +41,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 2.1+git108 +Version: 2.2.0~rc1 Release: %{?crmsh_release}%{?dist} Url: http://crmsh.github.io Source0: crmsh.tar.bz2 ++++++ crmsh.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/ChangeLog new/crmsh/ChangeLog --- old/crmsh/ChangeLog 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/ChangeLog 2014-10-28 23:50:46.000000000 +0100 @@ -1,3 +1,54 @@ +* Tue Oct 28 2014 Kristoffer Grönlund <kgronlund(a)suse.com> and many others +- Pre-release 2.2.0-rc1 +- cibconfig: Clean up output from crm_verify (bnc#893138) +- high: constants: Add acl_target and acl_group to cib_cli_map (bnc#894041) +- medium: cibconfig: Add set command +- doc: Rename asciidoc files to %.adoc +- high: parse: split shortcuts into valid rules +- medium: Handle broken CIB in find_objects +- high: scripts: Handle corosync.conf without nodelist in add-node (bnc#862577) +- low: template: Add 'new <template>' shortcut +- low: ui_configure: add rm as alias for delete +- low: ui_template: List both templates and configs by default +- medium: config: Assign default path in all cases +- low: main: Catch any ValueErrors that may leak through +- doc: Update TODO +- low: corosync: Check tools before use +- low: ui_ra: Don't crash when no OCF agents installed +- low: ra: Add systemd-support to RaOS +- doc: Updated documentation +- doc: Handle command names with underscore +- doc: Add tool to sort command list in documentation +- doc: Sort command list in documentation alphabetically +- high: cibconfig: Generate valid CLI syntax for attribute lists (bnc#897462) +- high: cibconfig: Add tag:<tag> to get all resources in tag +- low: report: Sort list of nodes +- low: ui_cluster: More informative error message +- low: main: Replace getopt with optparse +- high: parse: Allow empty attribute values in nvpairs (bnc#898625) +- high: ui_maintenance: Add maintenance sublevel (bnc#899234) +- medium: rsctest: Add basic support for systemd services +- medium: ui_maintenance: Combine action and actionssh into a single command +- low: rsctest: Better error message for unsupported action +- low: cibconfig: Improve wording of commit prompt +- high: cibconfig: Delay reinitialization after commit +- doc: Add website template for the nongnu page +- medium: main: Disable interspersed args +- low: cibconfig: Fix vim modeline +- high: report: Find nodes for any log type (boo#900654) +- high: hb_report: Collect logs from journald (boo#900654) +- doc: Clarified note for default-timeouts +- doc: Remove reference to crmsh documentation at clusterlabs.org +- doc: start-guide: Fix version check +- medium: xmlutil: Use idmgmt when creating new elements (bnc#901543) +- doc: cibconfig: Add note on inner ids after rename +- high: cibconfig: Don't crash if given an invalid pattern (bnc#901714) +- high: xmlutil: Filter list of referenced resources (bnc#901714) +- medium: ui_resource: Only act on resources (#64) +- medium: ui_resource: Flatten, then filter (#64) +- high: ui_resource: Use correct name for error function (bnc#901453) +- high: ui_resource: resource trace failed if operation existed (bnc#901453) + * Mon Jun 30 2014 Kristoffer Grönlund <kgronlund(a)suse.com> and many others - Release 2.1 - Add atom feed to development page diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/configure.ac new/crmsh/configure.ac --- old/crmsh/configure.ac 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/configure.ac 2014-10-28 23:50:46.000000000 +0100 @@ -21,7 +21,7 @@ dnl checks for library functions dnl checks for system services -AC_INIT(crmsh, 2.0, linux-ha(a)lists.linux-ha.org) +AC_INIT(crmsh, 2.2.0-rc1, linux-ha(a)lists.linux-ha.org) AC_ARG_WITH(version, [ --with-version=version Override package version (if you're a packager needing to pretend) ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/ui_resource.py new/crmsh/modules/ui_resource.py --- old/crmsh/modules/ui_resource.py 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/modules/ui_resource.py 2014-10-28 23:50:46.000000000 +0100 @@ -134,12 +134,16 @@ return ret return obj + def is_resource(obj): + return xmlutil.is_resource(obj.node) + objs = cib_factory.find_objects(rsc) if objs is None: common_error("CIB is not valid!") return False while any(obj for obj in objs if obj.obj_type == 'tag'): objs = list(flatten(resolve(obj) for obj in objs)) + objs = filter(is_resource, objs) common_debug("set_deep_meta_attr: %s" % (', '.join([obj.obj_id for obj in objs]))) if not objs: common_error("Resource not found: %s" % (rsc)) @@ -476,9 +480,11 @@ op_nodes = rsc.node.xpath('.//op') def trace(name): - if not any(o for o in op_nodes if o.get('name') == name): - if not self._add_trace_op(rsc, name, '0'): - context.err("Failed to add trace for %s:%s" % (rsc_id, name)) + for o in op_nodes: + if o.get('name') == name: + return + if not self._add_trace_op(rsc, name, '0'): + context.fatal_error("Failed to add trace for %s:%s" % (rsc_id, name)) trace('start') trace('stop') if xmlutil.is_ms(rsc.node): @@ -491,19 +497,19 @@ op_nodes = rsc.node.xpath('.//op[@name="%s"]' % (op)) if not op_nodes: if op == 'monitor': - context.err("No monitor operation configured for %s" % (rsc_id)) + context.fatal_error("No monitor operation configured for %s" % (rsc_id)) if not self._add_trace_op(rsc, op, '0'): - context.err("Failed to add trace for %s:%s" % (rsc_id, op)) + context.fatal_error("Failed to add trace for %s:%s" % (rsc_id, op)) for op_node in op_nodes: rsc.set_op_attr(op_node, constants.trace_ra_attr, "1") def _trace_op_interval(self, context, rsc_id, rsc, op, interval): op_node = xmlutil.find_operation(rsc.node, op, interval) if op_node is None and utils.crm_msec(interval) != 0: - context.err("Operation %s with interval %s not found in %s" % (op, interval, rsc_id)) + context.fatal_error("Operation %s with interval %s not found in %s" % (op, interval, rsc_id)) if op_node is None: if not self._add_trace_op(rsc, op, interval): - context.err("Failed to add trace for %s:%s" % (rsc_id, op)) + context.fatal_error("Failed to add trace for %s:%s" % (rsc_id, op)) else: rsc.set_op_attr(op_node, constants.trace_ra_attr, "1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/regression.sh new/crmsh/test/regression.sh --- old/crmsh/test/regression.sh 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/test/regression.sh 2014-10-28 23:50:46.000000000 +0100 @@ -144,6 +144,8 @@ ./evaltest.sh $testargs ) < $TESTDIR/$testcase > $outf 2>&1 + perl -pi -e 's/\<cib[^>]*\>/\<cib\>/g' $outf + filter_output < $outf | if [ "$prepare" ]; then echo " saving to expect file" >&3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/confbasic-xml.exp new/crmsh/test/testcases/confbasic-xml.exp --- old/crmsh/test/testcases/confbasic-xml.exp 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/test/testcases/confbasic-xml.exp 2014-10-28 23:50:46.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config> <cluster_property_set id="cib-bootstrap-options"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/node.exp new/crmsh/test/testcases/node.exp --- old/crmsh/test/testcases/node.exp 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/test/testcases/node.exp 2014-10-28 23:50:46.000000000 +0100 @@ -9,7 +9,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> @@ -30,7 +30,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> @@ -51,7 +51,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> @@ -73,7 +73,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> @@ -95,7 +95,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> @@ -119,7 +119,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> @@ -144,7 +144,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/resource.exp new/crmsh/test/testcases/resource.exp --- old/crmsh/test/testcases/resource.exp 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/test/testcases/resource.exp 2014-10-28 23:50:46.000000000 +0100 @@ -7,7 +7,7 @@ .INP: _regtest on .INP: show xml p3 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -27,7 +27,7 @@ .INP: _regtest on .INP: show xml p3 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -48,7 +48,7 @@ .INP: _regtest on .INP: show xml c1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -69,7 +69,7 @@ .INP: _regtest on .INP: show xml c1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -92,7 +92,7 @@ .INP: _regtest on .INP: show xml cli-prefer-p3 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -113,7 +113,7 @@ .INP: _regtest on .INP: show xml cli-prefer-p3 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -134,7 +134,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -156,7 +156,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -178,7 +178,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -197,7 +197,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -220,7 +220,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -243,7 +243,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -262,7 +262,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -288,7 +288,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -314,7 +314,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -340,7 +340,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -370,7 +370,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -400,7 +400,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -432,7 +432,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -464,7 +464,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -492,7 +492,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -516,7 +516,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -540,7 +540,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -568,7 +568,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -592,7 +592,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -616,7 +616,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -648,7 +648,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -681,7 +681,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> @@ -709,7 +709,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/rset-xml.exp new/crmsh/test/testcases/rset-xml.exp --- old/crmsh/test/testcases/rset-xml.exp 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/test/testcases/rset-xml.exp 2014-10-28 23:50:46.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib> <configuration> <crm_config/> <nodes> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/unittests/test_bugs.py new/crmsh/test/unittests/test_bugs.py --- old/crmsh/test/unittests/test_bugs.py 2014-10-17 17:46:44.000000000 +0200 +++ new/crmsh/test/unittests/test_bugs.py 2014-10-28 23:50:46.000000000 +0100 @@ -352,3 +352,21 @@ factory.create_from_node(etree.fromstring(tag)) elems = factory.get_elems_on_tag("tag:t0") assert set(x.obj_id for x in elems) == set(['r1', 'r2']) + +def test_ratrace(): + xml = '''<primitive class="ocf" id="%s" provider="pacemaker" type="Dummy"/>''' + factory.create_from_node(etree.fromstring(xml % ('r1'))) + factory.create_from_node(etree.fromstring(xml % ('r2'))) + factory.create_from_node(etree.fromstring(xml % ('r3'))) + + context = object() + + from ui_resource import RscMgmt + obj = factory.find_object('r1') + RscMgmt()._trace_resource(context, 'r1', obj) + + obj = factory.find_object('r1') + ops = obj.node.xpath('./operations/op') + for op in ops: + assert op.xpath('./instance_attributes/nvpair[@name="trace_ra"]/@value') == ["1"] + assert set(obj.node.xpath('./operations/op/@name')) == set(['start', 'stop']) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0