diff -r 1f97c05cfbab -r a21bafe9fe35 server/msplanner.py --- a/server/msplanner.py Wed May 04 14:55:27 2011 +0200 +++ b/server/msplanner.py Thu May 05 11:46:29 2011 +0200 @@ -483,7 +483,12 @@ else: var = vref.variable for rel in var.stinfo['relations'] - var.stinfo['rhsrelations']: - if rel.r_type in ('eid', 'name') and not rel.neged(strict=True): + # skip neged eid relation since it's the kind of query + # generated when clearing old value of '?1" relation, + # cw_source included. See + # unittest_ldapuser.test_copy_to_system_source + if rel.r_type == 'name' or \ + (rel.r_type == 'eid' and not rel.neged(strict=True)): if rel.r_type == 'eid': slist = sourceeids else: