Hello community, here is the log from the commit of package zypper checked in at Mon Nov 6 12:45:35 CET 2006. -------- --- zypper/zypper.changes 2006-11-05 22:38:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2006-11-06 09:48:28.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 6 09:48:06 CET 2006 - mvidner@suse.cz + +- Warn that we do not sync with ZMD (#217028). +- 0.6.1 + +------------------------------------------------------------------- Old: ---- zypper-0.6.0.tar.bz2 New: ---- zypper-0.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.wm21zu/_old 2006-11-06 12:45:30.000000000 +0100 +++ /var/tmp/diff_new_pack.wm21zu/_new 2006-11-06 12:45:30.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package zypper (Version 0.6.0) +# spec file for package zypper (Version 0.6.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,9 +21,9 @@ Autoreqprov: on PreReq: permissions Summary: Command Line Package Management Using Libzypp -Version: 0.6.0 +Version: 0.6.1 Release: 1 -Source: zypper-0.6.0.tar.bz2 +Source: zypper-0.6.1.tar.bz2 Prefix: /usr # RIP Provides: y2pmsh @@ -82,6 +82,9 @@ %doc %{_datadir}/doc/packages/zypper/zypper-rug %changelog -n zypper +* Mon Nov 06 2006 - mvidner@suse.cz +- Warn that we do not sync with ZMD (#217028). +- 0.6.1 * Sun Nov 05 2006 - mvidner@suse.cz - Implemented single package mode for update and list-updates, made it the default in rug-compatible mode. ++++++ zypper-0.6.0.tar.bz2 -> zypper-0.6.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.0/VERSION new/zypper-0.6.1/VERSION --- old/zypper-0.6.0/VERSION 2006-11-05 22:38:42.000000000 +0100 +++ new/zypper-0.6.1/VERSION 2006-11-06 09:47:58.000000000 +0100 @@ -6,5 +6,5 @@ dnl ================================================== m4_define([ZYPPER_MAJOR], [0]) m4_define([ZYPPER_MINOR], [6]) -m4_define([ZYPPER_PATCH], [0]) +m4_define([ZYPPER_PATCH], [1]) dnl ================================================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.0/configure new/zypper-0.6.1/configure --- old/zypper-0.6.0/configure 2006-11-05 22:39:07.000000000 +0100 +++ new/zypper-0.6.1/configure 2006-11-06 09:49:45.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for zypper 0.6.0. +# Generated by GNU Autoconf 2.59 for zypper 0.6.1. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -421,8 +421,8 @@ # Identity of this package. PACKAGE_NAME='zypper' PACKAGE_TARNAME='zypper' -PACKAGE_VERSION='0.6.0' -PACKAGE_STRING='zypper 0.6.0' +PACKAGE_VERSION='0.6.1' +PACKAGE_STRING='zypper 0.6.1' PACKAGE_BUGREPORT='' ac_unique_file="src/Makefile.am" @@ -969,7 +969,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures zypper 0.6.0 to adapt to many kinds of systems. +\`configure' configures zypper 0.6.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1036,7 +1036,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of zypper 0.6.0:";; + short | recursive ) echo "Configuration of zypper 0.6.1:";; esac cat <<\_ACEOF @@ -1186,7 +1186,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -zypper configure 0.6.0 +zypper configure 0.6.1 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1200,7 +1200,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by zypper $as_me 0.6.0, which was +It was created by zypper $as_me 0.6.1, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1929,7 +1929,7 @@ # Define the identity of the package. PACKAGE='zypper' - VERSION='0.6.0' + VERSION='0.6.1' cat >>confdefs.h <<_ACEOF @@ -22142,7 +22142,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by zypper $as_me 0.6.0, which was +This file was extended by zypper $as_me 0.6.1, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22205,7 +22205,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -zypper config.status 0.6.0 +zypper config.status 0.6.1 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.0/src/Makefile.am new/zypper-0.6.1/src/Makefile.am --- old/zypper-0.6.0/src/Makefile.am 2006-11-05 20:58:03.000000000 +0100 +++ new/zypper-0.6.1/src/Makefile.am 2006-11-06 09:47:29.000000000 +0100 @@ -76,3 +76,5 @@ #zmart_LDFLAGS = -static ## ################################################## + +EXTRA_DIST=$(logrotate_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.0/src/Makefile.in new/zypper-0.6.1/src/Makefile.in --- old/zypper-0.6.0/src/Makefile.in 2006-11-05 22:39:05.000000000 +0100 +++ new/zypper-0.6.1/src/Makefile.in 2006-11-06 09:49:42.000000000 +0100 @@ -300,6 +300,9 @@ zypp_checkpatches_wrapper_SOURCES = zypp-checkpatches-wrapper.c # empty: zypp_checkpatches_wrapper_LDADD = + +#zmart_LDFLAGS = -static +EXTRA_DIST = $(logrotate_DATA) all: all-am .SUFFIXES: @@ -671,8 +674,6 @@ uninstall-binPROGRAMS uninstall-info-am \ uninstall-logrotateDATA uninstall-sbinPROGRAMS - -#zmart_LDFLAGS = -static # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.0/src/zmart-sources.cc new/zypper-0.6.1/src/zmart-sources.cc --- old/zypper-0.6.0/src/zmart-sources.cc 2006-11-04 14:35:28.000000000 +0100 +++ new/zypper-0.6.1/src/zmart-sources.cc 2006-11-05 23:56:27.000000000 +0100 @@ -518,6 +518,15 @@ _mm.close (_id); } +// #217028 +void warn_if_zmd () { + if (system ("pgrep -lx zmd") == 0) { // list name, exact match + cerr << "ZENworks Management Daemon is running." << endl + << "WARNING: this command will not synchronize changes." << endl + << "Use rug or yast2 for that." << endl; + } +} + // Local Variables: // c-basic-offset: 2 // End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.0/src/zmart-sources.h new/zypper-0.6.1/src/zmart-sources.h --- old/zypper-0.6.0/src/zmart-sources.h 2006-11-01 17:06:36.000000000 +0100 +++ new/zypper-0.6.1/src/zmart-sources.h 2006-11-05 23:50:24.000000000 +0100 @@ -22,7 +22,7 @@ void rename_source( const std::string& anystring, const std::string& newalias ); void list_system_sources(); void refresh_sources(); - +void warn_if_zmd (); //! download a copy of a remote file or just return the argument // The file is deleted when this class is destroyed diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.0/src/zypper.cc new/zypper-0.6.1/src/zypper.cc --- old/zypper-0.6.0/src/zypper.cc 2006-11-05 22:38:42.000000000 +0100 +++ new/zypper-0.6.1/src/zypper.cc 2006-11-05 23:53:16.000000000 +0100 @@ -457,6 +457,8 @@ if (arguments.size() > 1) alias = arguments[1]; + warn_if_zmd (); + // load gpg keys cond_init_target (); @@ -484,6 +486,7 @@ return !help; } + warn_if_zmd (); try { // also stores it remove_source(arguments[0]); @@ -510,6 +513,7 @@ } cond_init_target (); + warn_if_zmd (); try { // also stores it rename_source (arguments[0], arguments[1]); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.0/src/zypper.lr new/zypper-0.6.1/src/zypper.lr --- old/zypper-0.6.0/src/zypper.lr 1970-01-01 01:00:00.000000000 +0100 +++ new/zypper-0.6.1/src/zypper.lr 2006-11-05 20:58:03.000000000 +0100 @@ -0,0 +1,13 @@ +/var/log/YaST2/zypper.log { + compress + dateext + notifempty + missingok + nocreate + + maxage 60 + rotate 99 + size 10M +} + + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org