Don't try to preserve permissions for env

1 files changed, 10 insertions, 3 deletions

diff --git a/paludis/repositories/e/ebuild/utils/unpaxinate.cc b/paludis/repositories/e/ebuild/utils/unpaxinate.cc
index 6da1a95aa..a246aeb3a 100644
--- a/paludis/repositories/e/ebuild/utils/unpaxinate.cc
+++ b/paludis/repositories/e/ebuild/utils/unpaxinate.cc
@@ -46,10 +46,19 @@ int main(int argc, char *argv[])
     {
         std::string archive_filename(archive_entry_pathname(entry));
         std::string out_filename;
+        int flags = 0;
+
         if (archive_filename == "PBIN/environment" && want_env)
+        {
             out_filename = "environment";
+            flags = ARCHIVE_EXTRACT_TIME;
+        }
         else if ((! want_env) && (0 != archive_filename.compare(0, 5, "PBIN/", 0, 5)))
+        {
             out_filename = archive_filename;
+            flags = ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_PERM | ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_ACL |
+                ARCHIVE_EXTRACT_FFLAGS | ARCHIVE_EXTRACT_XATTR | ARCHIVE_EXTRACT_SECURE_NODOTDOT;
+        }
         else
         {
             archive_read_data_skip(archive);
@@ -59,9 +68,7 @@ int main(int argc, char *argv[])
         std::cout << out_filename << std::endl;
         archive_entry_set_pathname(entry, out_filename.c_str());
 
-        if (ARCHIVE_OK != ((x = archive_read_extract(archive, entry, ARCHIVE_EXTRACT_OWNER |
-                            ARCHIVE_EXTRACT_PERM | ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_ACL |
-                            ARCHIVE_EXTRACT_FFLAGS | ARCHIVE_EXTRACT_XATTR | ARCHIVE_EXTRACT_SECURE_NODOTDOT))))
+        if (ARCHIVE_OK != ((x = archive_read_extract(archive, entry, flags))))
         {
             std::cerr << "Could not extract '" << out_filename << "' from '" << archive_file << "': libarchive returned " <<
                  x << ", archive_errno " << archive_errno(archive) << ": " << archive_error_string(archive) << std::endl;