Patterns are no longer pseudo installed (Fate#309385)

diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake
index 2e4db64e64766e4aa690147a95a316d9871e9c21..a6fa468549c46d37309811c2dcdd8bc366c6e082 100644 (file)
--- a/libzypp.spec.cmake
+++ b/libzypp.spec.cmake
@@ -72,7 +72,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  pkg-config
 %endif
 
-BuildRequires:  libsolv-devel >= 0.3.0
+BuildRequires:  libsolv-devel >= 0.4.1
 %if 0%{?suse_version} >= 1100
 %requires_eq    libsolv-tools
 %else

diff --git a/zypp/RepoManager.cc b/zypp/RepoManager.cc
index ccf6eae77f225390cc17ac81fb98b14283bd8988..aac27d1827a06adff5ee4ae7ecd31020c3682207 100644 (file)
--- a/zypp/RepoManager.cc
+++ b/zypp/RepoManager.cc
@@ -1174,10 +1174,10 @@ namespace zypp
 
         ExternalProgram::Arguments cmd;
         cmd.push_back( "repo2solv.sh" );
-
         // repo2solv expects -o as 1st arg!
         cmd.push_back( "-o" );
         cmd.push_back( solvfile.asString() );
+       cmd.push_back( "-X" );  // autogenerate pattern from pattern-package
 
         if ( repokind == RepoType::RPMPLAINDIR )
         {

diff --git a/zypp/ResTraits.h b/zypp/ResTraits.h
index e61dd088bfadfa396791baec1417e04c41afd1df..dd1723e4a6277b60d61ad838238bc5bc319afb3e 100644 (file)
--- a/zypp/ResTraits.h
+++ b/zypp/ResTraits.h
@@ -26,7 +26,7 @@ namespace zypp
     /** Those are denoted to be installed, if the
      *  solver verifies them as being satisfied. */
     inline bool isPseudoInstalled( ResKind kind_r )
-    { return( kind_r == ResKind::patch || kind_r == ResKind::pattern ); }
+    { return( kind_r == ResKind::patch ); }
 
     /////////////////////////////////////////////////////////////////
   } // namespace traits

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index 01c16121f68fd7a9017559da81a8cb96579a0e42..d698c0e927a9560d36119b71f4faab1ebead6fc1 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -1044,7 +1044,7 @@ namespace zypp
         cmd << "rpmdb2solv";
         if ( ! _root.empty() )
           cmd << " -r '" << _root << "'";
-
+       cmd << " -X";   // autogenerate pattern from pattern-package
         cmd << " -p '" << Pathname::assertprefix( _root, "/etc/products.d" ) << "'";
 
         if ( ! oldSolvFile.empty() )