Update from upstream #11

Closed
soksanichenko wants to merge 158 commits from a8_updated into a8
5 changed files with 16 additions and 15 deletions
Showing only changes of commit 778dcfa587 - Show all commits

View File

@ -541,7 +541,8 @@ def write_packages(compose, arch, variant, pkg_map, path_prefix):
def trim_packages(compose, arch, variant, pkg_map, parent_pkgs=None, remove_pkgs=None): def trim_packages(compose, arch, variant, pkg_map, parent_pkgs=None, remove_pkgs=None):
"""Remove parent variant's packages from pkg_map <-- it gets modified in this function """Remove parent variant's packages from pkg_map <-- it gets modified in
this function
There are three cases where changes may happen: There are three cases where changes may happen:

View File

@ -61,7 +61,7 @@ class EqualsAny(object):
return True return True
def __repr__(self): def __repr__(self):
return u"ANYTHING" return "ANYTHING"
ANYTHING = EqualsAny() ANYTHING = EqualsAny()