diff options
| -rw-r--r-- | pym/portage/sets/__init__.py | 5 | ||||
| -rw-r--r-- | pym/portage/xpak.py | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py index 3e1fbdb2e..0f4eca16a 100644 --- a/pym/portage/sets/__init__.py +++ b/pym/portage/sets/__init__.py @@ -12,6 +12,7 @@ from portage import flatten OPERATIONS = ["merge", "unmerge"] DEFAULT_SETS = ["world", "system", "everything", "security"] \ +["package_"+x for x in ["mask", "unmask", "use", "keywords"]] +del x class PackageSet(object): # Set this to operations that are supported by your subclass. While @@ -203,7 +204,7 @@ def make_extra_static_sets(configroot): for myname in mysets: if myname in DEFAULT_SETS: continue - rValue.add(StaticFileSet(fname, os.path.join(mydir, myname))) + rValue.add(StaticFileSet(myname, os.path.join(mydir, myname))) return rValue def make_category_sets(portdbapi, settings, only_visible=True): @@ -224,7 +225,7 @@ if __name__ == "__main__": for s in sys.argv[1:]: if s.startswith("category_"): c = s[9:] - l.add(CategorySet("category_%s" % c, c, portdbapi, only_visible=only_visible)) + l.add(CategorySet("category_%s" % c, c, portage.db['/']['porttree'].dbapi, only_visible=False)) elif os.path.exists(s): l.add(StaticFileSet(os.path.basename(s), s)) elif s != "*": diff --git a/pym/portage/xpak.py b/pym/portage/xpak.py index 2a015571c..e24da3010 100644 --- a/pym/portage/xpak.py +++ b/pym/portage/xpak.py @@ -126,7 +126,6 @@ def xsplit_mem(mydat): if mydat[-8:]!="XPAKSTOP": return None indexsize=decodeint(mydat[8:12]) - datasize=decodeint(mydat[12:16]) return (mydat[16:indexsize+16], mydat[indexsize+16:-8]) def getindex(infile): @@ -251,7 +250,7 @@ class tbz2(object): return self.unpackinfo(datadir) def compose(self,datadir,cleanup=0): """Alias for recompose().""" - return recompose(datadir,cleanup) + return self.recompose(datadir,cleanup) def recompose(self,datadir,cleanup=0): """Creates an xpak segment from the datadir provided, truncates the tbz2 to the end of regular data if an xpak segment already exists, and adds |