rqlrewrite: remove element in rewritten when we remove them from the select (closes #2236985) update _cleanup_inserted to avoid leaving rewritten variable behind when removing a snipset. insert_varmap_snippets was impacted too for unclear reason --- Before A KeyError was raised when: * multiple snipset is to be inserted on a statement * some *supported* snipset adds ambiguity (increase the number of solution) * some *unsupported* snipset adds new variable * The new variable require rewritting :: File "/home/pyves/src/fcw/cubicweb/rqlrewrite.py", line 185, in rewrite newsolutions = self.remove_ambiguities(snippets, newsolutions) File "/home/pyves/src/fcw/cubicweb/rqlrewrite.py", line 436, in remove_ambiguities variantes = self.build_variantes(newsolutions) File "/home/pyves/src/fcw/cubicweb/devtools/repotest.py", line 340, in _build_variantes variantes = _orig_build_variantes(self, newsolutions) File "/home/pyves/src/fcw/cubicweb/rqlrewrite.py", line 470, in build_variantes variante.append( (key, sol[newvar]) ) KeyError: u'D' This happen because the mechanism removing unsupported snipset does not remove entry in ``self.rewritten`` when it removes entry from ``self.select.defined_vars``. Iteration on ``self.rewritten`` then crash because values of ``rewritten`` are expected to be found in solution.

     1

/var/log/cubicweb/*.log {

     2

        weekly

     3

        missingok

     4

        rotate 10

     5

        compress

     6

        delaycompress

     7

        notifempty

     8

        create 640 root adm

     9

        sharedscripts

    10

        postrotate

    11

           if [ -x /usr/sbin/invoke-rc.d ]; then \

    12

              invoke-rc.d cubicweb reload > /dev/null 2>&1; \

    13

           else \

    14

              /etc/init.d/cubicweb reload > /dev/null 2>&1; \

    15

           fi; \

    16

        endscript

    17

}