-
Notifications
You must be signed in to change notification settings - Fork 261
Improve tgz file handling #7229
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: release-2.1
Are you sure you want to change the base?
Conversation
live627
commented
Jan 9, 2022
- Fixes Package manager won't parse some packages generated on OSX #7227
Is this compatible with #7228 or an alternative fix? |
This is alternative fix |
@live627 - two things:
I am also seeing issues trying to analyze a package for the cust site - slightly different, though, it cannot find package-info.xml at all.
I used the same test file we were using on the cust site with the OSX files. (Since I don't have a mac I need to use @jdarwood007 's example...) |
I saw you pushed some commits while I was writing up my earlier test results. I just retested, and all the issues reported above appear to have been addressed. I must admit, though, that rewrites of stable code always make me nervous... One of my most repeated complaints with PRs here... |
(When the destination is null, that is a request for a list of files in the archive.) |
If both fix the same thing, then I guess its a mater of choice. This one feels like it may be more complete in trying to handle the tar file according to the RFC. However we are late in 2.1 stages. I see it also added hints. While I like type hints, we have to be very careful of their usage in 2.1, because of so many places we could possibly break it. This PR also may need additional testing for open_basedir restriction testing, which the In all honesty, I think #7228 should be merged for 2.1. This one should go into the future because it is more complete into the RFC spec (as I see it handling some additional types other than files). @Sesquipedalian may want to make that decision though. |
Testing this one is pretty much the same as #7180 (comment) |
@live627 - I'm not sure this is a hard requirement for 2.1.0? |
Not important enough to hold up the release. The excising code works fine with the ubiquitous ustar format, just not the "newer" pax format. I'll let @Sesquipedalian assign a new milestone as he sees fit. |
I'd rather merge the full fix. However, there's really no hurry for dealing with this issue. I've been making SMF compatible tar.gz files on my Mac for years; it's just a matter of setting the right command line switches. Anyway, we can take the time to test this PR as thoroughly as we like after 2.1.0 is out. |
FYI, this didn't get merged into 2.1.0. Can we do the #7228 for 2.1.x? |
The speedup mentioned in the latest commit is 0.2 seconds with a package directory filled with 89 objects; package directories, php files, package files. |
…tes" This reverts commit 98ed90c.
This reverts commit 7d53a4a.
Signed-off-by: John Rayes <[email protected]>
Signed-off-by: John Rayes <[email protected]>
Signed-off-by: John Rayes <[email protected]>
@@ -1587,25 +1587,37 @@ function getPackages() | |||
|
|||
$installed_mods = loadInstalledPackages(); | |||
|
|||
$packagesdir='C:\Users\John\nf\df'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Derp
if ($file_info['filename'][-1] !== '/') | ||
$file_info['filename'] .= '/'; | ||
} | ||
elseif ($file_info['type'] === 'L') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since your updating these. Can you document the types heres. Still confusing.