Hello community,

here is the log from the commit of package yast2-ncurses-pkg for 
openSUSE:Factory checked in at 2012-03-29 07:49:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-ncurses-pkg (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-ncurses-pkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-ncurses-pkg", Maintainer is "g...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-ncurses-pkg/yast2-ncurses-pkg.changes      
2012-03-19 10:07:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-ncurses-pkg.new/yast2-ncurses-pkg.changes 
2012-03-29 07:49:50.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Mar 27 13:59:56 CEST 2012 - g...@suse.de
+
+- Select correct package version and vendor for update (bnc#704123)
+- remove libxcrypt-devel from BuildRequires 
+- 2.22.4
+
+-------------------------------------------------------------------

Old:
----
  yast2-ncurses-pkg-2.22.3.tar.bz2

New:
----
  yast2-ncurses-pkg-2.22.4.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-ncurses-pkg.spec ++++++
--- /var/tmp/diff_new_pack.gp1I7S/_old  2012-03-29 07:49:53.000000000 +0200
+++ /var/tmp/diff_new_pack.gp1I7S/_new  2012-03-29 07:49:53.000000000 +0200
@@ -18,7 +18,7 @@
 
 
 Name:           yast2-ncurses-pkg
-Version:        2.22.3
+Version:        2.22.4
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -27,7 +27,7 @@
 Group:          System/YaST
 License:        GPL-2.0
 BuildRequires:  dejagnu doxygen gcc-c++ libtool yast2-core-devel yast2-devtools
-BuildRequires:  blocxx-devel libxcrypt-devel ncurses-devel yast2-ncurses-devel
+BuildRequires:  blocxx-devel ncurses-devel yast2-ncurses-devel
 
 Summary:        YaST2 - Character Based Package Manager Frontend
 Provides:       yast2-ncurses:%{_libdir}/YaST2/plugin/libpy2ncurses.so

++++++ yast2-ncurses-pkg-2.22.3.tar.bz2 -> yast2-ncurses-pkg-2.22.4.tar.bz2 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.3/VERSION 
new/yast2-ncurses-pkg-2.22.4/VERSION
--- old/yast2-ncurses-pkg-2.22.3/VERSION        2012-03-14 14:26:37.000000000 
+0100
+++ new/yast2-ncurses-pkg-2.22.4/VERSION        2012-03-27 14:10:38.000000000 
+0200
@@ -1 +1 @@
-2.22.3
+2.22.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.3/configure 
new/yast2-ncurses-pkg-2.22.4/configure
--- old/yast2-ncurses-pkg-2.22.3/configure      2012-03-14 14:27:04.000000000 
+0100
+++ new/yast2-ncurses-pkg-2.22.4/configure      2012-03-27 14:12:18.000000000 
+0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-ncurses-pkg 2.22.3.
+# Generated by GNU Autoconf 2.68 for yast2-ncurses-pkg 2.22.4.
 #
 # Report bugs to <http://bugs.opensuse.org/>.
 #
@@ -709,8 +709,8 @@
 # Identity of this package.
 PACKAGE_NAME='yast2-ncurses-pkg'
 PACKAGE_TARNAME='yast2-ncurses-pkg'
-PACKAGE_VERSION='2.22.3'
-PACKAGE_STRING='yast2-ncurses-pkg 2.22.3'
+PACKAGE_VERSION='2.22.4'
+PACKAGE_STRING='yast2-ncurses-pkg 2.22.4'
 PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
 PACKAGE_URL=''
 
@@ -1492,7 +1492,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-pkg 2.22.3 to adapt to many kinds of 
systems.
+\`configure' configures yast2-ncurses-pkg 2.22.4 to adapt to many kinds of 
systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1564,7 +1564,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.22.3:";;
+     short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.22.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1680,7 +1680,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-yast2-ncurses-pkg configure 2.22.3
+yast2-ncurses-pkg configure 2.22.4
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2224,7 +2224,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-pkg $as_me 2.22.3, which was
+It was created by yast2-ncurses-pkg $as_me 2.22.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3154,7 +3154,7 @@
 
 # Define the identity of the package.
  PACKAGE='yast2-ncurses-pkg'
- VERSION='2.22.3'
+ VERSION='2.22.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3276,7 +3276,7 @@
 
 
 
-VERSION="2.22.3"
+VERSION="2.22.4"
 RPMNAME="yast2-ncurses-pkg"
 MAINTAINER="Gabriele Mohr <g...@suse.de>"
 
@@ -16076,7 +16076,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-pkg $as_me 2.22.3, which was
+This file was extended by yast2-ncurses-pkg $as_me 2.22.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16142,7 +16142,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-yast2-ncurses-pkg config.status 2.22.3
+yast2-ncurses-pkg config.status 2.22.4
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.3/configure.in 
new/yast2-ncurses-pkg-2.22.4/configure.in
--- old/yast2-ncurses-pkg-2.22.3/configure.in   2012-03-14 14:26:56.000000000 
+0100
+++ new/yast2-ncurses-pkg-2.22.4/configure.in   2012-03-27 14:12:12.000000000 
+0200
@@ -3,7 +3,7 @@
 dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-ncurses-pkg, 2.22.3, http://bugs.opensuse.org/, 
yast2-ncurses-pkg)
+AC_INIT(yast2-ncurses-pkg, 2.22.4, http://bugs.opensuse.org/, 
yast2-ncurses-pkg)
 dnl Check for presence of file 'RPMNAME'
 AC_CONFIG_SRCDIR([RPMNAME])
 
@@ -18,7 +18,7 @@
 AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
 
 dnl Important YaST2 variables
-VERSION="2.22.3"
+VERSION="2.22.4"
 RPMNAME="yast2-ncurses-pkg"
 MAINTAINER="Gabriele Mohr <g...@suse.de>"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.3/src/NCPackageSelector.cc 
new/yast2-ncurses-pkg-2.22.4/src/NCPackageSelector.cc
--- old/yast2-ncurses-pkg-2.22.3/src/NCPackageSelector.cc       2012-03-14 
13:39:51.000000000 +0100
+++ new/yast2-ncurses-pkg-2.22.4/src/NCPackageSelector.cc       2012-03-27 
09:31:28.000000000 +0200
@@ -252,12 +252,15 @@
 
 bool NCPackageSelector::isAllowVendorChange()
 {
-    return zypp::getZYpp()->resolver()->allowVendorChange();
+    zypp::Resolver_Ptr resolver = zypp::getZYpp()->resolver();
+    bool change = resolver->allowVendorChange();
+    yuiMilestone() << "Vendor change allowed: " << (change?"true":"false") << 
endl;    
+    return change;
 }
 
 void NCPackageSelector::setAllowVendorChange( bool on )
 {
-     return zypp::getZYpp()->resolver()->setAllowVendorChange( on );
+    return zypp::getZYpp()->resolver()->setAllowVendorChange( on );
 }
 
 //////////////////////////////////////////////////////////////////
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.3/src/NCPkgMenuAction.cc 
new/yast2-ncurses-pkg-2.22.4/src/NCPkgMenuAction.cc
--- old/yast2-ncurses-pkg-2.22.3/src/NCPkgMenuAction.cc 2012-01-17 
13:31:04.000000000 +0100
+++ new/yast2-ncurses-pkg-2.22.4/src/NCPkgMenuAction.cc 2012-03-27 
13:26:09.000000000 +0200
@@ -168,6 +168,9 @@
     else 
        yuiError() << "zatim nic" << endl;
 
+    if ( pkg->VersionsList() )
+        pkg->VersionsList()->updateTable();
+    
     return true;
 
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.3/src/NCPkgStatusStrategy.cc 
new/yast2-ncurses-pkg-2.22.4/src/NCPkgStatusStrategy.cc
--- old/yast2-ncurses-pkg-2.22.3/src/NCPkgStatusStrategy.cc     2012-01-17 
13:32:40.000000000 +0100
+++ new/yast2-ncurses-pkg-2.22.4/src/NCPkgStatusStrategy.cc     2012-03-27 
13:57:06.000000000 +0200
@@ -617,14 +617,14 @@
            }
        }
 
-       // Set status
-       ok = slbPtr->setStatus( status );
-       yuiMilestone() << "Set status of: " << slbPtr->name() << " to: "
-         << status << " returns: " << (ok?"true":"false") << endl;
-
        // Set candidate
        ok = slbPtr->setCandidate( newCandidate );
        yuiMilestone() << "Set user candidate returns: " <<  
(ok?"true":"false") << endl;
+       
+        // Set status
+       ok = slbPtr->setStatus( status );
+       yuiMilestone() << "Set status of: " << slbPtr->name() << " to: "
+         << status << " returns: " << (ok?"true":"false") << endl;
 
     }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.3/src/NCPkgTable.cc 
new/yast2-ncurses-pkg-2.22.4/src/NCPkgTable.cc
--- old/yast2-ncurses-pkg-2.22.3/src/NCPkgTable.cc      2012-03-06 
13:19:10.000000000 +0100
+++ new/yast2-ncurses-pkg-2.22.4/src/NCPkgTable.cc      2012-03-27 
13:57:06.000000000 +0200
@@ -1002,19 +1002,21 @@
                    break;
                }
                case A_Delete: {
-                   if ( slbPtr->status() == S_KeepInstalled )
+                   if ( slbPtr->installedObj() && slbPtr->status() != 
S_Protected )
                        ok = statusStrategy->keyToStatus( '-', slbPtr, objPtr, 
newStatus );
                    break;
                }
                case A_UpdateNewer: {
-                   if ( slbPtr->status() == S_KeepInstalled && 
slbPtr->hasCandidateObj() ) {
-                       if ( slbPtr->installedObj()->edition() < 
slbPtr->candidateObj()->edition() ) 
-                           ok = statusStrategy->keyToStatus( '>', slbPtr, 
objPtr, newStatus );
-                   }
+                    // set status to update respecting "vendor change" 
settings 
+                    if ( slbPtr->installedObj() && slbPtr->status() != 
S_Protected && slbPtr->updateCandidateObj() )
+                    {
+                        slbPtr->setOnSystem( slbPtr->updateCandidateObj() );
+                        ok = statusStrategy->keyToStatus( '>', slbPtr, objPtr, 
newStatus );
+                    }
                    break;
                }
                case A_Update: {
-                   if ( slbPtr->status() == S_KeepInstalled )
+                   if ( slbPtr->installedObj() && slbPtr->status() != 
S_Protected )
                        ok = statusStrategy->keyToStatus( '>', slbPtr, objPtr, 
newStatus );
                    break;
                }

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to