Magento 1.9.2.1 SUPEE-6788补丁 - Hunk失败.htaccess

Question

我刚刚在我们的magento 1.9.2.1安装中应用了supree 6788补丁,但是在执行时

sh PATCH_SUPEE-6788_CE_1.9.2.1_v1-2015-10-26-11-38-41.sh

我得到以下内容: -

 15-10-26-11-38-41.sh
    Checking if patch can be applied/reverted successfully...
    ERROR: Patch can't be applied/reverted successfully.

    patching file .htaccess
    Hunk #1 FAILED at 207.
    1 out of 1 hunk FAILED -- saving rejects to file .htaccess.rej
    patching file .htaccess.sample
    patching file app/code/core/Mage/Admin/Model/Block.php
    patching file app/code/core/Mage/Admin/Model/Resource/Block.php
    patching file app/code/core/Mage/Admin/Model/Resource/Block/Collection.php
    patching file app/code/core/Mage/Admin/Model/Resource/Variable.php
    patching file app/code/core/Mage/Admin/Model/Resource/Variable/Collection.php
    patching file app/code/core/Mage/Admin/Model/Variable.php
    patching file app/code/core/Mage/Admin/etc/config.xml
    patching file app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.1-1.6.1.2.php
    patching file app/code/core/Mage/Adminhtml/Block/Permissions/Block.php
    patching file app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit.php
    patching file app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit/Form.php
    patching file app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php
    patching file app/code/core/Mage/Adminhtml/Block/Permissions/Variable.php
    patching file app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit.php
    patching file app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit/Form.php
    patching file app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Grid.php
    patching file app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php
    patching file app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php
    patching file app/code/core/Mage/Adminhtml/etc/adminhtml.xml
    patching file app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
    patching file app/code/core/Mage/Core/Controller/Front/Action.php
    patching file app/code/core/Mage/Core/Controller/Varien/Router/Admin.php
    patching file app/code/core/Mage/Core/Helper/UnserializeArray.php
    patching file app/code/core/Mage/Core/Model/Email/Template/Filter.php
    patching file app/code/core/Mage/Core/Model/Resource/Setup.php
    patching file app/code/core/Mage/Core/etc/config.xml
    patching file app/code/core/Mage/Core/etc/system.xml
    patching file app/code/core/Mage/Customer/Block/Account/Changeforgotten.php
    patching file app/code/core/Mage/Customer/Block/Account/Resetpassword.php
    patching file app/code/core/Mage/Customer/controllers/AccountController.php
    patching file app/code/core/Mage/Downloadable/Model/Product/Type.php
    patching file app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php
    patching file app/code/core/Mage/Sales/Model/Resource/Order/Item/Collection.php
    patching file app/code/core/Mage/Sales/controllers/DownloadController.php
    patching file app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php
    patching file app/design/adminhtml/default/default/layout/admin.xml
    patching file app/design/frontend/base/default/layout/customer.xml
    patching file app/design/frontend/base/default/template/customer/form/register.phtml
    patching file app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml
    patching file app/design/frontend/base/default/template/persistent/customer/form/register.phtml
    patching file app/design/frontend/default/iphone/layout/customer.xml
    patching file app/design/frontend/default/modern/layout/customer.xml
    patching file app/design/frontend/rwd/default/layout/customer.xml
    patching file app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml
    patching file app/design/frontend/rwd/default/template/persistent/customer/form/register.phtml
    patching file cron.php
    The next patch would delete the file dev/tests/functional/.htaccess,
    which does not exist!  Assume -R? [n]
    Apply anyway? [n]
    Skipping patch.
    1 out of 1 hunk ignored
    patching file errors/processor.php
    patching file lib/Unserialize/Parser.php
    patching file lib/Unserialize/Reader/Arr.php
    patching file lib/Unserialize/Reader/ArrKey.php
    patching file lib/Unserialize/Reader/ArrValue.php
    patching file lib/Unserialize/Reader/Bool.php
    patching file lib/Unserialize/Reader/Dbl.php
    patching file lib/Unserialize/Reader/Int.php
    patching file lib/Unserialize/Reader/Str.php
    patching file lib/Varien/Data/Collection/Db.php
    patching file lib/Zend/Xml/Security.php

我认为补丁没有正确应用？

Answer 1

这是因为编辑过的.htaccess文件.

1)备份.htaccess文件

2)用.htaccess.sample中的数据替换.htaccess文件(如果没有,请从Magento安装库中下载.htaccess.sample文件)

3)应用补丁

4)在.htaccess中复制备份

5)添加补丁添加到htaccess文件的cron.php行.

Answer 2

使用.htaccess.sample将无法正常工作.在库存magento安装,.htaccess并.htaccess.sample是不同的大小.您需要使用stock magento .htaccess作为您的版本.上传库存版本后,您可以应用补丁,然后只需将文件底部的文件标签添加.htaccess到您的版本中.htaccess.