remove 'Arch_src'

diff --git a/zypp/Arch.cc b/zypp/Arch.cc
index 999607e..7cb647b 100644 (file)
--- a/zypp/Arch.cc
+++ b/zypp/Arch.cc
@@ -353,9 +353,6 @@ namespace zypp
 
   const Arch Arch_ia64  ( _ia64 );
 
-  // not a built in but a hack
-  const Arch Arch_src( "src" );
-
   ///////////////////////////////////////////////////////////////////
   //
   //   METHOD NAME : Arch::Arch

diff --git a/zypp/Arch.h b/zypp/Arch.h
index 93bc4d0..6e0049a 100644 (file)
--- a/zypp/Arch.h
+++ b/zypp/Arch.h
@@ -108,8 +108,6 @@ namespace zypp
   //@{
   /** \relates Arch */
   extern const Arch Arch_noarch;
-  /** \todo actually not an Arch but kind of resolvable. */
-  extern const Arch Arch_src;
 
   /** \relates Arch */
   extern const Arch Arch_x86_64;

diff --git a/zypp/detail/ResolvableImpl.cc b/zypp/detail/ResolvableImpl.cc
index 22b668f..092efea 100644 (file)
--- a/zypp/detail/ResolvableImpl.cc
+++ b/zypp/detail/ResolvableImpl.cc
@@ -47,11 +47,10 @@ namespace zypp
   , _arch( nvrad_r.arch )
   , _deps( nvrad_r )
   {
-    if (_arch != Arch_src) {
     // assert self provides
     _deps[Dep::PROVIDES].insert( CapFactory()
                                  .parse( _kind, _name, Rel::EQ, _edition ) );
-    }
+
     // Filter 'rpmlib(...)' requirements (refill from nvrad_r)
     filterUnwantedReq( nvrad_r[Dep::PREREQUIRES], _deps[Dep::PREREQUIRES] );
     filterUnwantedReq( nvrad_r[Dep::REQUIRES], _deps[Dep::REQUIRES] );

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index f49c732..df2c39f 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -436,11 +436,12 @@ TargetImpl::getResolvablesToInsDel ( const ResPool pool_r,
     {
        if (it->status().isToBeInstalled())
        {
-           if ((*it)->kind() != ResTraits<Package>::kind) {
+           if ((*it)->kind() != ResTraits<SrcPackage>::kind) {
+               srclist_r.push_back( *it );
+           }
+           else if ((*it)->kind() != ResTraits<Package>::kind) {
                nonpkglist.push_back( *it );
            }
-           else if (it->resolvable()->arch() == Arch_src)
-               srclist_r.push_back( *it );
            else
                instlist_r.push_back( *it );
        }