Skip to content

Commit 4a63861

Browse files
Merge pull request #8988 from Daaaav/fix-some-package-actions-30
2 parents 0edca0a + 3860ad0 commit 4a63861

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Sources/PackageManager/PackageManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ public function installTest(): void
746746
}
747747

748748
// Don't fail if a file/directory we're trying to create doesn't exist...
749-
if (isset($action['filename']) && !file_exists($file) && !\in_array($action['type'], ['create-dir', 'create-file']) && $action['error'] != 'ignore') {
749+
if (isset($action['filename']) && !file_exists($file) && !\in_array($action['type'], ['create-dir', 'create-file', 'move-dir', 'move-file']) && $action['error'] != 'ignore') {
750750
Utils::$context['has_failure'] = true;
751751

752752
$thisAction += [

Sources/PackageManager/PackageUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,7 @@ public static function parsePackageInfo(XmlArray &$packageXML, bool $testing_onl
14541454
}
14551455

14561456
// Create an empty file.
1457-
self::packagePutContents($action['destination'], self::packageGetContents($action['source']), $testing_only);
1457+
self::packagePutContents($action['destination'], '', $testing_only);
14581458

14591459
if (!file_exists($action['destination'])) {
14601460
$failure = true;

0 commit comments

Comments
 (0)