Hello community, here is the log from the commit of package zypper checked in at Mon Nov 20 19:03:55 CET 2006. -------- --- zypper/zypper.changes 2006-11-20 13:56:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2006-11-20 18:04:46.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Nov 20 17:29:57 CET 2006 - mvidner@suse.cz + +- Respect "update --skip-interactive" (#221476). +- list-updates: warn if we are listing only patches affecting the + package manager and there are also others. +- 0.6.13 + +------------------------------------------------------------------- Old: ---- zypper-0.6.12.tar.bz2 New: ---- zypper-0.6.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.NBslva/_old 2006-11-20 19:02:59.000000000 +0100 +++ /var/tmp/diff_new_pack.NBslva/_new 2006-11-20 19:02:59.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package zypper (Version 0.6.12) +# spec file for package zypper (Version 0.6.13) # # 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.12 +Version: 0.6.13 Release: 1 -Source: zypper-0.6.12.tar.bz2 +Source: zypper-0.6.13.tar.bz2 Prefix: /usr # zypper is not a fully featured replacement yet #Provides: y2pmsh @@ -93,6 +93,11 @@ %changelog -n zypper * Mon Nov 20 2006 - mvidner@suse.cz +- Respect "update --skip-interactive" (#221476). +- list-updates: warn if we are listing only patches affecting the + package manager and there are also others. +- 0.6.13 +* Mon Nov 20 2006 - mvidner@suse.cz - update -t package: keep the same architecture (#222140). - 0.6.12 * Wed Nov 15 2006 - mvidner@suse.cz ++++++ zypper-0.6.12.tar.bz2 -> zypper-0.6.13.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.12/VERSION new/zypper-0.6.13/VERSION --- old/zypper-0.6.12/VERSION 2006-11-20 13:53:50.000000000 +0100 +++ new/zypper-0.6.13/VERSION 2006-11-20 17:34:45.000000000 +0100 @@ -10,5 +10,5 @@ dnl ================================================== m4_define([ZYPPER_MAJOR], [0]) m4_define([ZYPPER_MINOR], [6]) -m4_define([ZYPPER_PATCH], [12]) +m4_define([ZYPPER_PATCH], [13]) dnl ================================================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.12/configure new/zypper-0.6.13/configure --- old/zypper-0.6.12/configure 2006-11-20 13:58:15.000000000 +0100 +++ new/zypper-0.6.13/configure 2006-11-20 17:36:25.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.12. +# Generated by GNU Autoconf 2.59 for zypper 0.6.13. # # 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.12' -PACKAGE_STRING='zypper 0.6.12' +PACKAGE_VERSION='0.6.13' +PACKAGE_STRING='zypper 0.6.13' 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.12 to adapt to many kinds of systems. +\`configure' configures zypper 0.6.13 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.12:";; + short | recursive ) echo "Configuration of zypper 0.6.13:";; 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.12 +zypper configure 0.6.13 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.12, which was +It was created by zypper $as_me 0.6.13, 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.12' + VERSION='0.6.13' cat >>confdefs.h <<_ACEOF @@ -22164,7 +22164,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by zypper $as_me 0.6.12, which was +This file was extended by zypper $as_me 0.6.13, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22227,7 +22227,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -zypper config.status 0.6.12 +zypper config.status 0.6.13 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.12/doc/zypper.8 new/zypper-0.6.13/doc/zypper.8 --- old/zypper-0.6.12/doc/zypper.8 2006-11-14 16:59:36.000000000 +0100 +++ new/zypper-0.6.13/doc/zypper.8 2006-11-20 17:03:07.000000000 +0100 @@ -92,6 +92,11 @@ .TP .I \-y, \-\-no-confirm Don't require user confirmation. +.TP +.I \-\-skip\-interactive +This will skip interactive patches, that is those that need a reboot, +contain a message, or update a package whose license needs to be +confirmed. .B NOTE: Zypper prefers to update only those packages for which a patch diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.12/src/zmart-misc.cc new/zypper-0.6.13/src/zmart-misc.cc --- old/zypper-0.6.12/src/zmart-misc.cc 2006-11-20 13:39:54.000000000 +0100 +++ new/zypper-0.6.13/src/zmart-misc.cc 2006-11-20 18:02:20.000000000 +0100 @@ -483,17 +483,24 @@ tr << patch->category(); tr << string_status (it->status ()); - tbl << tr; if (patch->affects_pkg_manager ()) pm_tbl << tr; + else + tbl << tr; } } } // those that affect the package manager go first // (TODO: user option for this?) - if (!pm_tbl.empty ()) + if (!pm_tbl.empty ()) { + if (!tbl.empty ()) { + cerr << _("WARNING: These are only the updates affecting the updater itself.\n" + "There are others available too.\n") << flush; + + } tbl = pm_tbl; + } tbl.sort (1); // Name cout << tbl; @@ -616,7 +623,8 @@ return result; } -void mark_patch_updates () +static +void mark_patch_updates (bool skip_interactive) { if (true) { // search twice: if there are none with affects_pkg_manager, retry on all @@ -633,8 +641,18 @@ if ( it->status().isNeeded() ) { Patch::constPtr patch = asKind<Patch>(res); if (attempt == 1 || patch->affects_pkg_manager ()) { - nothing_found = false; - mark_item_install (*it); + // #221476 + if (skip_interactive && patch->interactive()) { + // Skipping a patch because it is interactive and + // --skip-interactive is requested. %s is a name of a + // patch + cerr << format (_("WARNING: %s is interactive, skipped.")) + % res << endl; + } + else { + nothing_found = false; + mark_item_install (*it); + } } } } @@ -642,12 +660,12 @@ } } -void mark_updates( const ResObject::Kind &kind ) +void mark_updates( const ResObject::Kind &kind, bool skip_interactive ) { bool k_is_patch = kind == ResTraits<Patch>::kind; if (k_is_patch) { - mark_patch_updates (); + mark_patch_updates (skip_interactive); } else { Candidates candidates; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.12/src/zmart-misc.h new/zypper-0.6.13/src/zmart-misc.h --- old/zypper-0.6.12/src/zmart-misc.h 2006-11-13 14:46:10.000000000 +0100 +++ new/zypper-0.6.13/src/zmart-misc.h 2006-11-20 17:11:09.000000000 +0100 @@ -36,7 +36,7 @@ void show_patches(); void patch_check(); void list_updates( const zypp::ResObject::Kind &kind ); -void mark_updates( const zypp::ResObject::Kind &kind ); +void mark_updates( const zypp::ResObject::Kind &kind, bool skip_interactive ); void usage(int argc, char **argv); int solve_and_commit (bool non_interactive = false); bool confirm_licenses(bool non_interactive = false); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.12/src/zypper.cc new/zypper-0.6.13/src/zypper.cc --- old/zypper-0.6.12/src/zypper.cc 2006-11-14 16:56:29.000000000 +0100 +++ new/zypper-0.6.13/src/zypper.cc 2006-11-20 17:25:31.000000000 +0100 @@ -319,6 +319,7 @@ static struct option update_options[] = { {"type", required_argument, 0, 't'}, {"no-confirm", no_argument, 0, 'y'}, + {"skip-interactive", no_argument, 0, 0}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; @@ -326,6 +327,7 @@ specific_help = " Command options:\n" "\t--type,-t\t\tType of resolvable (default: patch!)\n" "\t--no-confirm,-y\t\tDon't require user confirmation\n" + "\t--skip-interactive\t\tSkip interactive updates\n" ; } else if (command == "search" || command == "se") { @@ -860,7 +862,8 @@ cond_load_resolvables (); establish (); - mark_updates (kind); + bool skip_interactive = copts.count("skip-interactive"); + mark_updates (kind, skip_interactive); // commit // returns ZYPPER_EXIT_OK, ZYPPER_EXIT_ERR_ZYPP, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org