Hello community,
here is the log from the commit of package yast2-ncurses
checked in at Fri Apr 7 12:04:53 CEST 2006.
--------
--- yast2-ncurses/yast2-ncurses.changes 2006-03-29 14:46:07.000000000 +0200
+++ yast2-ncurses/yast2-ncurses.changes 2006-04-07 12:03:56.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Apr 7 08:05:46 CEST 2006 - gs@suse.de
+
+- solve pattern/selection dependencies correctly (bug #161400),
+ show architecture in versions view
+- 2.13.17
+
+-------------------------------------------------------------------
Old:
----
yast2-ncurses-2.13.16.tar.bz2
New:
----
yast2-ncurses-2.13.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses.spec ++++++
--- /var/tmp/diff_new_pack.qtZeIK/_old 2006-04-07 12:04:05.000000000 +0200
+++ /var/tmp/diff_new_pack.qtZeIK/_new 2006-04-07 12:04:05.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ncurses (Version 2.13.16)
+# spec file for package yast2-ncurses (Version 2.13.17)
#
# Copyright (c) 2006 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.13.16
+Version: 2.13.17
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-2.13.16.tar.bz2
+Source0: yast2-ncurses-2.13.17.tar.bz2
prefix: /usr
BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools
BuildRequires: blocxx-devel libxcrypt-devel
@@ -40,7 +40,7 @@
%prep
-%setup -n yast2-ncurses-2.13.16
+%setup -n yast2-ncurses-2.13.17
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,10 @@
%doc %{prefix}/share/doc/packages/yast2-ncurses
%changelog -n yast2-ncurses
+* Fri Apr 07 2006 - gs@suse.de
+- solve pattern/selection dependencies correctly (bug #161400),
+ show architecture in versions view
+- 2.13.17
* Wed Mar 29 2006 - gs@suse.de
- Show/set correct status information for packages in versions view
(available packages)
++++++ yast2-ncurses-2.13.16.tar.bz2 -> yast2-ncurses-2.13.17.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.16/VERSION new/yast2-ncurses-2.13.17/VERSION
--- old/yast2-ncurses-2.13.16/VERSION 2006-03-29 14:44:17.000000000 +0200
+++ new/yast2-ncurses-2.13.17/VERSION 2006-04-07 08:00:35.000000000 +0200
@@ -1 +1 @@
-2.13.16
+2.13.17
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.16/configure new/yast2-ncurses-2.13.17/configure
--- old/yast2-ncurses-2.13.16/configure 2006-03-22 13:35:15.000000000 +0100
+++ new/yast2-ncurses-2.13.17/configure 2006-04-05 10:48:25.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-ncurses 2.13.13.
+# Generated by GNU Autoconf 2.59 for yast2-ncurses 2.13.16.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ncurses'
PACKAGE_TARNAME='yast2-ncurses'
-PACKAGE_VERSION='2.13.13'
-PACKAGE_STRING='yast2-ncurses 2.13.13'
+PACKAGE_VERSION='2.13.16'
+PACKAGE_STRING='yast2-ncurses 2.13.16'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -959,7 +959,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.13.13 to adapt to many kinds of systems.
+\`configure' configures yast2-ncurses 2.13.16 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1026,7 +1026,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-ncurses 2.13.13:";;
+ short | recursive ) echo "Configuration of yast2-ncurses 2.13.16:";;
esac
cat <<\_ACEOF
@@ -1169,7 +1169,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ncurses configure 2.13.13
+yast2-ncurses configure 2.13.16
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1183,7 +1183,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.13.13, which was
+It was created by yast2-ncurses $as_me 2.13.16, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1913,7 +1913,7 @@
# Define the identity of the package.
PACKAGE='yast2-ncurses'
- VERSION='2.13.13'
+ VERSION='2.13.16'
cat >>confdefs.h <<_ACEOF
@@ -2124,7 +2124,7 @@
-VERSION="2.13.13"
+VERSION="2.13.16"
RPMNAME="yast2-ncurses"
MAINTAINER="Martin Lazar "
@@ -19928,7 +19928,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-ncurses $as_me 2.13.13, which was
+This file was extended by yast2-ncurses $as_me 2.13.16, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19991,7 +19991,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-ncurses config.status 2.13.13
+yast2-ncurses config.status 2.13.16
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/yast2-ncurses-2.13.16/configure.in new/yast2-ncurses-2.13.17/configure.in
--- old/yast2-ncurses-2.13.16/configure.in 2006-03-22 13:35:00.000000000 +0100
+++ new/yast2-ncurses-2.13.17/configure.in 2006-04-05 10:48:12.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ncurses, 2.13.13, http://www.suse.de/feedback, yast2-ncurses)
+AC_INIT(yast2-ncurses, 2.13.16, http://www.suse.de/feedback, 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.13.13"
+VERSION="2.13.16"
RPMNAME="yast2-ncurses"
MAINTAINER="Martin Lazar "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.16/src/NCPkgTable.cc new/yast2-ncurses-2.13.17/src/NCPkgTable.cc
--- old/yast2-ncurses-2.13.16/src/NCPkgTable.cc 2006-03-29 12:23:52.000000000 +0200
+++ new/yast2-ncurses-2.13.17/src/NCPkgTable.cc 2006-04-06 21:18:58.000000000 +0200
@@ -505,7 +505,10 @@
}
header.push_back( "L" + PkgNames::PkgSummary() );
header.push_back( "L" + PkgNames::PkgSize() );
- header.push_back( "L" + PkgNames::PkgSource() );
+// installation of source rpms is not possible
+#ifdef FIXME
+ header.push_back( "L" + PkgNames::PkgSource() );
+#endif
break;
}
case T_PatchPkgs: {
@@ -540,6 +543,7 @@
header.push_back( "L" + PkgNames::PkgVersion() );
header.push_back( "L" + PkgNames::PkgInstSource() );
header.push_back( "L" + PkgNames::PkgSize() );
+ header.push_back( "L" + PkgNames::PkgArch() );
break;
}
default: {
@@ -613,7 +617,8 @@
zypp::ByteCount size = pkgPtr->size(); // installed size
pkgLine.push_back( size.asString( 8 ) ); // format size
-
+ pkgLine.push_back( pkgPtr->arch().asString()); // architecture
+
break;
}
default: {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.16/src/NCPopupSelection.cc new/yast2-ncurses-2.13.17/src/NCPopupSelection.cc
--- old/yast2-ncurses-2.13.16/src/NCPopupSelection.cc 2006-03-07 13:31:20.000000000 +0100
+++ new/yast2-ncurses-2.13.17/src/NCPopupSelection.cc 2006-04-05 19:06:37.000000000 +0200
@@ -95,7 +95,7 @@
sel = new NCPkgTable( split, opt );
sel->setPackager( packager );
// set status strategy
- ObjectStatStrategy * strat = new PackageStatStrategy();
+ ObjectStatStrategy * strat = new SelectionStatStrategy();
sel->setTableType( NCPkgTable::T_Selections, strat );
sel->fillHeader();
split->addChild( sel );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.16/src/ObjectStatStrategy.cc new/yast2-ncurses-2.13.17/src/ObjectStatStrategy.cc
--- old/yast2-ncurses-2.13.16/src/ObjectStatStrategy.cc 2006-03-29 13:56:18.000000000 +0200
+++ new/yast2-ncurses-2.13.17/src/ObjectStatStrategy.cc 2006-04-06 21:14:36.000000000 +0200
@@ -60,7 +60,7 @@
}
else
{
- NCERR << "Object pointer not valid" << endl;
+ NCERR << "Selectable pointer not valid" << endl;
return S_NoInst;
}
}
@@ -435,14 +435,61 @@
NCMIL << "Set status of: " << slbPtr->name() << " to: "
<< newstatus << " returns: " << (ok?"true":"false") << endl;
- // additionally inform the YOU patch manager about the status change
- // (which sets the correct status of the patch packages)
-#ifdef FIXME
- Y2PM::youPatchManager().updatePackageStates();
-#endif
+ // solve patch + atoms
+ solveResKindzypp::Patch();
+ solveResKindzypp::Atom();
+
return ok;
}
+//------------------------------------------------------------
+// Class for strategies for selections
+//------------------------------------------------------------
+
+//
+// Constructor
+//
+SelectionStatStrategy::SelectionStatStrategy()
+ : ObjectStatStrategy()
+{
+}
+
+/////////////////////////////////////////////////////////////////
+//
+// SelectionStatStrategy::setObjectStatus()
+//
+// Inform the package manager about the status change
+// of the selection
+//
+bool SelectionStatStrategy::setObjectStatus( ZyppStatus newstatus, ZyppSel slbPtr, ZyppObj objPtr )
+{
+ bool ok = false;
+
+ if ( !slbPtr || !objPtr )
+ {
+ NCERR << "Invalid selection" << endl;
+ return false;
+ }
+
+ ok = slbPtr->set_status( newstatus );
+ NCMIL << "Set status of: " << slbPtr->name() << " to: "
+ << newstatus << " returns: " << (ok?"true":"false") << endl;
+
+ // solve selections/patterns
+ ZyppSelection selPtr = tryCastToZyppSelection (objPtr);
+ ZyppPattern patPtr = tryCastToZyppPattern (objPtr);
+
+ if (selPtr)
+ {
+ solveResKindzypp::Selection();
+ }
+ else if (patPtr)
+ {
+ solveResKindzypp::Pattern();
+ }
+
+ return ok;
+}
//------------------------------------------------------------
// Class for strategies for depndencies
@@ -480,7 +527,7 @@
{
bool ok = false;
- if ( !slbPtr )
+ if ( !slbPtr || !objPtr )
{
return false;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.16/src/ObjectStatStrategy.h new/yast2-ncurses-2.13.17/src/ObjectStatStrategy.h
--- old/yast2-ncurses-2.13.16/src/ObjectStatStrategy.h 2006-03-15 17:10:54.000000000 +0100
+++ new/yast2-ncurses-2.13.17/src/ObjectStatStrategy.h 2006-04-05 19:06:43.000000000 +0200
@@ -23,6 +23,14 @@
#include "YQZypp.h"
#include
+template<class ZyppKind_T> void solveResKind()
+{
+ zypp::Resolver_Ptr resolver = zypp::getZYpp()->resolver();
+
+ resolver->transactReset( zypp::ResStatus::SOLVER );
+ resolver->transactResKind( zypp::ResTraits::kind );
+}
+
//------------------------------------------------------------
// Abstract base class for strategies to get status for packages or patches
//------------------------------------------------------------
@@ -117,6 +125,30 @@
};
//------------------------------------------------------------
+// Class for strategies of selections
+//------------------------------------------------------------
+class SelectionStatStrategy : public ObjectStatStrategy
+{
+public:
+
+ SelectionStatStrategy( );
+
+ virtual ~SelectionStatStrategy() {}
+
+ /**
+ * Sets the status of the selection
+ * @param newStatus The new selection status
+ * @param slbPtr The selectable pointer
+ * @qparam objPtr The object (selection) pointer
+ * @return bool
+ */
+ virtual bool setObjectStatus( ZyppStatus newstatus,
+ ZyppSel slbPtr,
+ ZyppObj objPtr );
+
+};
+
+//------------------------------------------------------------
// Class for strategies to handle status of packages belonging to a patch
//------------------------------------------------------------
class PatchPkgStatStrategy : public ObjectStatStrategy
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.16/src/PkgNames.cc new/yast2-ncurses-2.13.17/src/PkgNames.cc
--- old/yast2-ncurses-2.13.16/src/PkgNames.cc 2006-03-28 11:08:32.000000000 +0200
+++ new/yast2-ncurses-2.13.17/src/PkgNames.cc 2006-04-06 21:21:06.000000000 +0200
@@ -1407,6 +1407,13 @@
return value;
}
+const string PkgNames::PkgArch()
+{
+ // column header package architecture (keep it short!)
+ static const string value = _( "Architecture" );
+ return value;
+}
+
const string PkgNames::PkgSource()
{
// column header source RPM installation (keep it short!)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.16/src/PkgNames.h new/yast2-ncurses-2.13.17/src/PkgNames.h
--- old/yast2-ncurses-2.13.16/src/PkgNames.h 2006-03-28 11:09:03.000000000 +0200
+++ new/yast2-ncurses-2.13.17/src/PkgNames.h 2006-04-06 21:21:02.000000000 +0200
@@ -758,7 +758,12 @@
*/
static const string PkgSize();
- /**
+ /**
+ * Column header package architecture
+ */
+ static const string PkgArch();
+
+ /**
* Column header package source
*/
static const string PkgSource();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...