diff options
| author | Michael Schroeder <mls@suse.de> | 2012-04-03 10:53:26 +0200 |
|---|---|---|
| committer | Michael Schroeder <mls@suse.de> | 2012-04-03 10:53:26 +0200 |
| commit | 17ea16d7e5d7842b593855a4bb7acf349f0d2e03 (patch) | |
| tree | 157cd93f972d603aaafa52525672412f704f453e /src/policy.c | |
| parent | d1275e7fcce9d4fc23f418d3b841d8940d2cc163 (diff) | |
| download | libsolv-17ea16d7e5d7842b593855a4bb7acf349f0d2e03.tar.gz libsolv-17ea16d7e5d7842b593855a4bb7acf349f0d2e03.tar.bz2 libsolv-17ea16d7e5d7842b593855a4bb7acf349f0d2e03.zip | |
- get rid of DEBINA_SEMANTICS, add pool->noarchid, add DISTTYPE_ARCH
Diffstat (limited to 'src/policy.c')
| -rw-r--r-- | src/policy.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/policy.c b/src/policy.c index 3e8a6ed..7465565 100644 --- a/src/policy.c +++ b/src/policy.c @@ -681,13 +681,8 @@ policy_illegal_archchange(Solver *solv, Solvable *s1, Solvable *s2) } /* we allow changes to/from noarch */ -#ifndef DEBIAN_SEMANTICS - if (a1 == a2 || a1 == ARCH_NOARCH || a2 == ARCH_NOARCH) + if (a1 == a2 || a1 == pool->noarchid || a2 == pool->noarchid) return 0; -#else - if (a1 == a2 || a1 == ARCH_ALL || a2 == ARCH_ALL) - return 0; -#endif if (!pool->id2arch) return 0; a1 = a1 <= pool->lastarch ? pool->id2arch[a1] : 0; |