Hello community,
here is the log from the commit of package yast2-ncurses
checked in at Thu Feb 22 14:55:43 CET 2007.
--------
--- yast2-ncurses/yast2-ncurses.changes 2007-02-14 16:04:04.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2007-02-21 13:34:09.639118000 +0100
@@ -1,0 +2,9 @@
+Wed Feb 21 13:00:58 CET 2007 - kmachalkova@suse.cz
+
+- Show 'automatic changes' popup when any pkgs are selected for
+ installation by 'verify system' call (#239750)
+- Remember pkgs already marked for automatic installation by 'verify
+ system' and do not show them in 'automatic changes' popup again
+- 2.15.8
+
+-------------------------------------------------------------------
Old:
----
yast2-ncurses-2.15.7.tar.bz2
New:
----
yast2-ncurses-2.15.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses.spec ++++++
--- /var/tmp/diff_new_pack.Wo5220/_old 2007-02-22 14:55:12.000000000 +0100
+++ /var/tmp/diff_new_pack.Wo5220/_new 2007-02-22 14:55:12.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ncurses (Version 2.15.7)
+# spec file for package yast2-ncurses (Version 2.15.8)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-ncurses
-Version: 2.15.7
+Version: 2.15.8
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-2.15.7.tar.bz2
+Source0: yast2-ncurses-2.15.8.tar.bz2
prefix: /usr
BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools
BuildRequires: blocxx-devel libxcrypt-devel
@@ -44,7 +44,7 @@
%prep
-%setup -n yast2-ncurses-2.15.7
+%setup -n yast2-ncurses-2.15.8
%build
%{prefix}/bin/y2tool y2autoconf
@@ -76,7 +76,13 @@
/usr/share/YaST2/data/you_layout.ycp
%doc %{prefix}/share/doc/packages/yast2-ncurses
-%changelog -n yast2-ncurses
+%changelog
+* Wed Feb 21 2007 - kmachalkova@suse.cz
+- Show 'automatic changes' popup when any pkgs are selected for
+ installation by 'verify system' call (#239750)
+- Remember pkgs already marked for automatic installation by 'verify
+ system' and do not show them in 'automatic changes' popup again
+- 2.15.8
* Wed Feb 14 2007 - kmachalkova@suse.cz
- Use generic xterm/vt100 termifo in case required terminfo is missing
(#235954)
++++++ yast2-ncurses-2.15.7.tar.bz2 -> yast2-ncurses-2.15.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.7/VERSION new/yast2-ncurses-2.15.8/VERSION
--- old/yast2-ncurses-2.15.7/VERSION 2007-02-14 16:01:15.000000000 +0100
+++ new/yast2-ncurses-2.15.8/VERSION 2007-02-21 13:06:10.000000000 +0100
@@ -1 +1 @@
-2.15.7
+2.15.8
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.7/configure new/yast2-ncurses-2.15.8/configure
--- old/yast2-ncurses-2.15.7/configure 2007-02-06 16:51:42.000000000 +0100
+++ new/yast2-ncurses-2.15.8/configure 2007-02-21 13:26:46.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-ncurses 2.15.7.
+# Generated by GNU Autoconf 2.60 for yast2-ncurses 2.15.8.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -713,8 +713,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ncurses'
PACKAGE_TARNAME='yast2-ncurses'
-PACKAGE_VERSION='2.15.7'
-PACKAGE_STRING='yast2-ncurses 2.15.7'
+PACKAGE_VERSION='2.15.8'
+PACKAGE_STRING='yast2-ncurses 2.15.8'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1421,7 +1421,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 yast2-ncurses 2.15.7 to adapt to many kinds of systems.
+\`configure' configures yast2-ncurses 2.15.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1492,7 +1492,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-ncurses 2.15.7:";;
+ short | recursive ) echo "Configuration of yast2-ncurses 2.15.8:";;
esac
cat <<\_ACEOF
@@ -1600,7 +1600,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ncurses configure 2.15.7
+yast2-ncurses configure 2.15.8
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1614,7 +1614,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-ncurses $as_me 2.15.7, which was
+It was created by yast2-ncurses $as_me 2.15.8, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2415,7 +2415,7 @@
# Define the identity of the package.
PACKAGE='yast2-ncurses'
- VERSION='2.15.7'
+ VERSION='2.15.8'
cat >>confdefs.h <<_ACEOF
@@ -2642,7 +2642,7 @@
-VERSION="2.15.7"
+VERSION="2.15.8"
RPMNAME="yast2-ncurses"
MAINTAINER="Katarina Machalkova "
@@ -21648,7 +21648,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-ncurses $as_me 2.15.7, which was
+This file was extended by yast2-ncurses $as_me 2.15.8, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21701,7 +21701,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-ncurses config.status 2.15.7
+yast2-ncurses config.status 2.15.8
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.7/configure.in new/yast2-ncurses-2.15.8/configure.in
--- old/yast2-ncurses-2.15.7/configure.in 2007-02-06 16:51:30.000000000 +0100
+++ new/yast2-ncurses-2.15.8/configure.in 2007-02-21 13:26:34.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ncurses, 2.15.7, http://bugs.opensuse.org/, yast2-ncurses)
+AC_INIT(yast2-ncurses, 2.15.8, http://bugs.opensuse.org/, yast2-ncurses)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.7"
+VERSION="2.15.8"
RPMNAME="yast2-ncurses"
MAINTAINER="Katarina Machalkova "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.7/src/NCPopupPkgTable.cc new/yast2-ncurses-2.15.8/src/NCPopupPkgTable.cc
--- old/yast2-ncurses-2.15.7/src/NCPopupPkgTable.cc 2006-08-18 13:12:35.000000000 +0200
+++ new/yast2-ncurses-2.15.8/src/NCPopupPkgTable.cc 2007-02-20 14:41:44.000000000 +0100
@@ -23,6 +23,7 @@
#include "NCSplit.h"
#include "NCSpacing.h"
#include "PkgNames.h"
+#include "PackageSelector.h"
#include "NCLabel.h"
#include "NCPushButton.h"
#include "NCPkgTable.h"
@@ -146,10 +147,26 @@
pkgTable->itemsCleared(); // clear the table
- set<string> ignoredNames = zypp::ui::userWantedPackageNames();
+ set<string> ignoredNames;
+ set<string> userWantedNames = zypp::ui::userWantedPackageNames();
+ //these are the packages already selected for autoinstallation in previous 'verify system' run
+ set<string> verifiedNames = packager->getVerifiedPkgs();
+
+ //initialize storage for the new set
+ insert_iterator< set<string> > result (ignoredNames, ignoredNames.begin());
+
+ if(!verifiedNames.empty())
+ {
+ //if we have some leftovers from previous run, do the union of the sets
+ set_union(userWantedNames.begin(), userWantedNames.end(),
+ verifiedNames.begin(), verifiedNames.end(), result );
+ }
+ else
+ //else just take userWanted stuff
+ ignoredNames = userWantedNames;
for ( set<string>::iterator it = ignoredNames.begin(); it != ignoredNames.end(); ++it )
- NCDBG << "Ignoring: " << *it << endl;
+ NCMIL << "Ignoring: " << *it << endl;
ZyppPoolIterator
b = zyppPkgBegin(),
@@ -170,6 +187,8 @@
{
NCMIL << "The status of " << pkgPtr->name() << " has automatically changed" << endl;
pkgTable->createListEntry( pkgPtr, slb );
+ //also add to 'already verified' set
+ packager->insertVerifiedPkg( pkgPtr->name() );
}
}
}
@@ -266,6 +285,9 @@
if ( !currentId.isNull()
&& currentId->compare( PkgNames::Cancel() ) == YO_EQUAL )
{
+ //user hit cancel - discard set of changes (if not empty)
+ packager->clearVerifiedPkgs();
+
// close the dialog
postevent = NCursesEvent::cancel;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.7/src/NCPopupPkgTable.h new/yast2-ncurses-2.15.8/src/NCPopupPkgTable.h
--- old/yast2-ncurses-2.15.7/src/NCPopupPkgTable.h 2006-08-18 13:12:33.000000000 +0200
+++ new/yast2-ncurses-2.15.8/src/NCPopupPkgTable.h 2007-02-20 14:41:44.000000000 +0100
@@ -23,6 +23,7 @@
#include <vector>
#include <string>
+#include <algorithm>
#include "NCPopup.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.7/src/PackageSelector.cc new/yast2-ncurses-2.15.8/src/PackageSelector.cc
--- old/yast2-ncurses-2.15.7/src/PackageSelector.cc 2007-01-10 17:27:18.000000000 +0100
+++ new/yast2-ncurses-2.15.8/src/PackageSelector.cc 2007-02-20 14:41:44.000000000 +0100
@@ -2545,9 +2545,22 @@
bool PackageSelector::verifyPackageDependencies ()
{
bool cancel = false;
+ NCMIL << "Verifying system" << endl;
if ( depsPopup )
{
+ saveState();
+ //call the solver (with S_Verify it displays no popup)
cancel = depsPopup->showDependencies( NCPopupDeps::S_Verify );
+ //display the popup with automatic changes
+ NCPopupPkgTable autoChangePopup( wpos( 1, 1), this );
+ NCursesEvent input = autoChangePopup.showInfoPopup();
+
+ if ( input == NCursesEvent::cancel )
+ {
+ // user clicked on Cancel
+ restoreState();
+ cancel = true;
+ }
}
return cancel;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.7/src/PackageSelector.h new/yast2-ncurses-2.15.8/src/PackageSelector.h
--- old/yast2-ncurses-2.15.7/src/PackageSelector.h 2007-01-10 17:27:19.000000000 +0100
+++ new/yast2-ncurses-2.15.8/src/PackageSelector.h 2007-02-21 13:26:30.000000000 +0100
@@ -104,7 +104,9 @@
// Mapping from ZyppPkg to the correspoinding ZyppSel.
NCPkgSelMapper selMapper;
-
+
+ set<string> verified_pkgs;
+
protected:
@@ -449,6 +451,36 @@
void createFilterMenu();
+ /**
+ * Get list of packages already selected for automatic changes
+ * (usually via 'verify system' call)
+ * @return std::set <string>
+ */
+ set <string> getVerifiedPkgs()
+ {
+ return verified_pkgs;
+ }
+
+ /**
+ * Insert package name into the list of already selected for automatic changes
+ * @param pkgname Package name
+ */
+ void insertVerifiedPkg( string pkgname ) {
+ verified_pkgs.insert( pkgname);
+ }
+
+ /**
+ * Empty the set of packages selected for automatic changes
+ * @return void
+ */
+ void clearVerifiedPkgs() {
+ if ( !verified_pkgs.empty() )
+ {
+ NCMIL << "Discarding auto-dependency changes" << endl;
+ verified_pkgs.clear();
+ }
+ }
+
};
///////////////////////////////////////////////////////////////////
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org