MAGETWO-59042: Static content duplication for multiple locales

- fix bug with wrong LESS overrides checking

Author: vkorotun

app/code/Magento/Deploy/Package/PackageFile.php

@@ -20,6 +20,11 @@ class PackageFile extends Asset
      */
     private $package;
 
+    /**
+     * @var Package
+     */
+    private $origPackage;
+
     /**
      * @var string
      */
@@ -42,6 +47,9 @@ class PackageFile extends Asset
     public function setPackage(Package $package)
     {
         $this->package = $package;
+        if ($this->origPackage === null) {
+            $this->origPackage = $package;
+        }
 
         $package->addFile($this);
         $package->addFileToMap($this);
@@ -57,6 +65,14 @@ public function getPackage()
         return $this->package;
     }
 
+    /**
+     * @return Package
+     */
+    public function getOrigPackage()
+    {
+        return $this->origPackage;
+    }
+
     /**
      * @param string $name
      * @return bool

app/code/Magento/Deploy/Package/Processor/PreProcessor/Less.php

@@ -91,7 +91,7 @@ public function process(Package $package, array $options)
             $files = $package->getParentFiles('less');
             foreach ($files as $file) {
                 $packageFile = $package->getFile($file->getFileId());
-                if ($packageFile && $packageFile->getPackage() === $package) {
+                if ($packageFile && $packageFile->getOrigPackage() === $package) {
                     continue;
                 }
                 $deployFileName = $this->fileNameResolver->resolve($file->getFileName());

app/code/Magento/Deploy/Service/DeployPackage.php

@@ -201,25 +201,17 @@ private function processFile(PackageFile $file, Package $package)
      */
     private function checkIfCanCopy(PackageFile $file, Package $package, Package $parentPackage = null)
     {
-        return !$this->checkIfFileBelongsToPackage($file, $package)
-        && $parentPackage && $parentPackage !== $package
-        && ($parentFile = $parentPackage->getFile($file->getFileId()))
-        && !$this->checkIfFileBelongsToPackage($parentFile, $parentPackage)
+        return $parentPackage
+        && $file->getOrigPackage() !== $package
+        && (
+            $file->getArea() !== $package->getArea()
+            || $file->getTheme() !== $package->getTheme()
+            || $file->getLocale() !== $package->getLocale()
+        )
+        && $file->getOrigPackage() == $parentPackage
         && $this->deployStaticFile->readFile($file->getDeployedFileId(), $parentPackage->getPath());
     }
 
-    /**
-     * @param PackageFile $file
-     * @param Package $package
-     * @return bool
-     */
-    private function checkIfFileBelongsToPackage(PackageFile $file, Package $package)
-    {
-        return $package->getArea() === $file->getArea()
-        && $package->getTheme() === $file->getTheme()
-        && $package->getLocale() === $file->getLocale();
-    }
-
     /**
      * Check if file can be deployed
      *