Remove deprecated _x variants from definitions.

Replaced by XATTRS_OPTIONS use in applicable (de)compressors. Signed-off-by: Brian Dolbec <[email protected]>
dol-sen · Nov 4, 2021 · 0e53690 · 0e53690
1 parent 3bf66d6
commit 0e53690
Showing 1 changed file with 0 additions and 99 deletions.
diff --git a/DeComp/definitions.py b/DeComp/definitions.py
@@ -108,15 +108,6 @@ class functions do.
                 ],
                 "LBZIP2", ["tar.bz2"], {"tar", "lbzip2"},
               ],
-    "lbzip2_x": [
-                    "_common", "tar",
-                    [
-                        "--xattrs", "--xattrs-include=security.capability",
-                        "--xattrs-include=user.pax.flags", "%(comp_prog)s", "lbzip2",
-                        "-cf", "%(filename)s", "-C", "%(basedir)s", "%(source)s"
-                    ],
-                    "LBZIP2", ["tar.bz2"], {"tar", "lbzip2"},
-                ],
     "bzip2": [
                 "_common", "tar",
                 [
@@ -125,15 +116,6 @@ class functions do.
                 ],
                 "BZIP2", ["tar.bz2"], {"tar", "bzip2"},
              ],
-    "bzip2_x": [
-                "_common", "tar",
-                [
-                    "--xattrs", "--xattrs-include=security.capability",
-                    "--xattrs-include=user.pax.flags", "-cpjf",
-                    "%(filename)s", "-C", "%(basedir)s", "%(source)s",
-                ],
-                "BZIP2", ["tar.bz2"], {"tar", "bzip2"},
-               ],
     "lzip": [
                 "_common", "tar",
                 [
@@ -166,15 +148,6 @@ class functions do.
                 ],
                 "TAR", ["tar"], {"tar"},
            ],
-    "tar_x": [
-                "_common", "tar",
-                [
-                    "--xattrs", "--xattrs-include=security.capability",
-                    "--xattrs-include=user.pax.flags", "-cpf",
-                    "%(filename)s", "-C", "%(basedir)s", "%(source)s"
-                ],
-                "TAR", ["tar"], {"tar"},
-             ],
     "xz": [
             "_common", "tar",
             [
@@ -183,15 +156,6 @@ class functions do.
             ],
             "XZ", ["tar.xz"], {"tar"},
           ],
-    "xz_x": [
-                "_common", "tar",
-                [
-                    "--xattrs", "--xattrs-include=security.capability",
-                    "--xattrs-include=user.pax.flags", "-cpJf",
-                    "%(filename)s", "-C", "%(basedir)s", "%(source)s"
-                ],
-                "XZ", ["tar.xz"], {"tar"},
-            ],
     "pixz": [
                 "_common", "tar",
                 [
@@ -208,15 +172,6 @@ class functions do.
                 ],
                 "PIXZ", ["tar.xz", "tpxz", "xz"], {"tar", "pixz"},
             ],
-    "pixz_x": [
-                "_common", "tar",
-                [
-                    "--xattrs", "--xattrs-include=security.capability",
-                    "--xattrs-include=user.pax.flags", "%(comp_prog)s", "pixz", "-cpf",
-                    "%(filename)s", "-C", "%(basedir)s", "%(source)s"
-                ],
-                "PIXZ", ["tar.xz", "tpxz", "xz"], {"tar", "pixz"},
-              ],
     "zstd": [
                 "_common", "tar",
                 [
@@ -241,15 +196,6 @@ class functions do.
                 ],
                 "GZIP", ["tar.gz"], {"tar"},
             ],
-    "gzip_x": [
-                "_common", "tar",
-                [
-                    "--xattrs", "--xattrs-include=security.capability",
-                    "--xattrs-include=user.pax.flags", "-cpzf",
-                    "%(filename)s", "-C", "%(basedir)s", "%(source)s"
-                ],
-                "GZIP", ["tar.gz"], {"tar"},
-              ],
     "squashfs_xz": [
                     "_sqfs", "mksquashfs",
                     [
@@ -301,15 +247,6 @@ class functions do.
                 ],
                 "LBZIP2", ["tar.bz2", "bz2", "tbz2"], {"tar", "lbzip2"},
               ],
-    "lbzip2_x": [
-                    "_common", "tar",
-                    [
-                        "--xattrs", "--xattrs-include=security.capability",
-                        "--xattrs-include=user.pax.flags", "%(comp_prog)s",
-                        "lbzip2", "-xpf", "%(source)s", "-C", "%(destination)s"
-                    ],
-                    "LBZIP2", ["tar.bz2", "bz2", "tbz2"], {"tar", "lbzip2"},
-                ],
     "bzip2": [
                 "_common", "tar",
                 [
@@ -318,15 +255,6 @@ class functions do.
                 ],
                 "BZIP2", ["tar.bz2", "bz2", "tbz2"], {"tar", "bzip2"},
              ],
-    "bzip2_x": [
-                    "_common", "tar",
-                    [
-                        "--xattrs", "--xattrs-include=security.capability",
-                        "--xattrs-include=user.pax.flags", "-xpf", "%(source)s",
-                        "-C", "%(destination)s"
-                    ],
-                    "BZIP2", ["tar.bz2", "bz2", "tbz2"], {"tar", "bzip2"},
-               ],
     "lzip": [
                 "_common", "tar",
                 [
@@ -356,29 +284,11 @@ class functions do.
                 ["other_options", "-xpf", "%(source)s", "-C", "%(destination)s"],
                 "TAR", ["tar"], {"tar"},
            ],
-    "tar_x": [
-                "_common", "tar",
-                [
-                    "--xattrs", "--xattrs-include=security.capability",
-                    "--xattrs-include=user.pax.flags", "-xpf", "%(source)s",
-                    "-C", "%(destination)s"
-                ],
-                "TAR", ["tar"], {"tar"},
-             ],
     "xz": [
             "_common", "tar",
             ["other_options", "-xpf", "%(source)s", "-C", "%(destination)s"],
             "XZ", ["tar.xz", "xz"], {"tar"},
           ],
-    "xz_x": [
-                "_common", "tar",
-                [
-                    "--xattrs", "--xattrs-include=security.capability",
-                    "--xattrs-include=user.pax.flags", "-xpf", "%(source)s",
-                    "-C", "%(destination)s"
-                ],
-                "XZ", ["tar.xz", "xz"], {"tar"},
-            ],
     "pixz": [
                 "_common", "tar",
                 [
@@ -420,15 +330,6 @@ class functions do.
                 ],
                 "GZIP", ["tar.gz", "gz"], {"tar"},
             ],
-    "gzip_x": [
-                "_common", "tar",
-                [
-                    "--xattrs", "--xattrs-include=security.capability",
-                    "--xattrs-include=user.pax.flags", "-xpzf", "%(source)s",
-                    "-C", "%(destination)s"
-                ],
-                "GZIP", ["tar.gz", "gz"], {"tar"},
-              ],
     "squashfs": [
                     "_common", "unsquashfs",
                     [