projects
/
platform
/
upstream
/
libzypp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cc0ce69
)
suppress atoms in patch contents
author
Stefan Hundhammer
<sh@suse.de>
Wed, 29 Mar 2006 11:03:47 +0000
(11:03 +0000)
committer
Stefan Hundhammer
<sh@suse.de>
Wed, 29 Mar 2006 11:03:47 +0000
(11:03 +0000)
zypp/ui/PatchContentsImpl.cc
patch
|
blob
|
history
diff --git
a/zypp/ui/PatchContentsImpl.cc
b/zypp/ui/PatchContentsImpl.cc
index
ea0fdad
..
a555800
100644
(file)
--- a/
zypp/ui/PatchContentsImpl.cc
+++ b/
zypp/ui/PatchContentsImpl.cc
@@
-46,7
+46,8
@@
namespace zypp
{
// DBG << "Found " << (*atom_it)->name() << " " << (*foundNames)->edition().asString() << endl;
- if ( (*atom_it)->edition() == (*foundNames)->edition() &&
+ if ( ! isKind<Atom>( (*foundNames).resolvable() ) &&
+ (*atom_it)->edition() == (*foundNames)->edition() &&
(*atom_it)->arch() == (*foundNames)->arch() )
{
found = true;