Skip to main content
added 1 character in body; edited tags
Source Link
7ochem
  • 7.6k
  • 14
  • 52
  • 80

I reverted SUPEE-1533 as sugustedsuggested successfully but when I try to patch SUPEE-8788, I get "Hunk #1 FAILED at 91" Please see the log below

I reverted SUPEE-1533 as sugusted successfully but when I try to patch SUPEE-8788, I get "Hunk #1 FAILED at 91" Please see the log below

I reverted SUPEE-1533 as suggested successfully but when I try to patch SUPEE-8788, I get "Hunk #1 FAILED at 91" Please see the log below

Post Closed as "Duplicate" by Rakesh Jesadiya, Amit Bera, Qaisar Satti, brentwpeterson, Marius
add tags, remove fluff, clarify title
Source Link
Fabian Schmengler
  • 66.1k
  • 25
  • 188
  • 422

Magento 1.9.2.0 SUPEE-8788 v2 Hunk #1 FAILED at 91 after reverting SUPEE-1533

Any help will be much appreciated please. Thanks

Magento 1.9.2.0 SUPEE-8788 v2 Hunk #1 FAILED at 91

Any help will be much appreciated please. Thanks

Magento 1.9.2.0 SUPEE-8788 v2 Hunk #1 FAILED at 91 after reverting SUPEE-1533

added 421 characters in body
Source Link

sh PATCH_SUPEE-8788_CE_1.9.2.0_v2-2016-10-14-09-39-55.sh Checking if patch can be applied/reverted successfully... ERROR: Patch can't be applied/reverted successfully. patching file app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php patching file app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php patching file app/code/core/Mage/Adminhtml/Block/Media/Uploader.php patching file app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php patching file app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php patching file app/code/core/Mage/Adminhtml/controllers/DashboardController.php Hunk #1 FAILED at 91. 1 out of 1 hunk FAILED -- saving rejects to file app/code/core/Mage/Adminhtml/controllers/DashboardController.php.rej patching file app/code/core/Mage/Adminhtml/controllers/IndexController.php patching file app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php patching file app/code/core/Mage/Catalog/Helper/Image.php patching file app/code/core/Mage/Catalog/etc/config.xml patching file app/code/core/Mage/Catalog/etc/system.xml patching file app/code/core/Mage/Centinel/Model/Api.php patching file app/code/core/Mage/Centinel/Model/Api/Client.php patching file app/code/core/Mage/Core/Block/Abstract.php patching file app/code/core/Mage/Core/Helper/Url.php patching file app/code/core/Mage/Core/Model/Encryption.php patching file app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php patching file app/code/core/Mage/Core/functions.php patching file app/code/core/Mage/Customer/Block/Address/Book.php patching file app/code/core/Mage/Customer/controllers/AddressController.php patching file app/code/core/Mage/Dataflow/Model/Profile.php patching file app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php patching file app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php patching file app/code/core/Mage/Downloadable/Helper/File.php patching file app/code/core/Mage/Oauth/Model/Server.php patching file app/code/core/Mage/Paygate/Model/Authorizenet.php patching file app/code/core/Mage/Payment/Block/Info/Checkmo.php patching file app/code/core/Mage/Paypal/Model/Express/Checkout.php patching file app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php patching file app/code/core/Mage/Sales/Model/Resource/Order/Payment.php patching file app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php patching file app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php patching file app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php patching file app/code/core/Mage/Uploader/Block/Abstract.php patching file app/code/core/Mage/Uploader/Block/Multiple.php patching file app/code/core/Mage/Uploader/Block/Single.php patching file app/code/core/Mage/Uploader/Helper/Data.php patching file app/code/core/Mage/Uploader/Helper/File.php patching file app/code/core/Mage/Uploader/Model/Config/Abstract.php patching file app/code/core/Mage/Uploader/Model/Config/Browsebutton.php patching file app/code/core/Mage/Uploader/Model/Config/Misc.php patching file app/code/core/Mage/Uploader/Model/Config/Uploader.php patching file app/code/core/Mage/Uploader/etc/config.xml patching file app/code/core/Mage/Uploader/etc/jstranslator.xml patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php patching file app/code/core/Mage/Usa/etc/config.xml patching file app/code/core/Mage/Usa/etc/system.xml patching file app/code/core/Mage/Wishlist/Helper/Data.php patching file app/code/core/Mage/Wishlist/controllers/IndexController.php patching file app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design.php patching file app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Images.php patching file app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php patching file app/design/adminhtml/default/default/layout/cms.xml patching file app/design/adminhtml/default/default/layout/main.xml patching file app/design/adminhtml/default/default/layout/xmlconnect.xml patching file app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml patching file app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml patching file app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml patching file app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml patching file app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml patching file app/design/adminhtml/default/default/template/media/uploader.phtml patching file app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml patching file app/etc/modules/Mage_All.xml can't find file to patch at input line 4703 Perhaps you used the wrong -p or --strip option? The text leading up to this was:

|diff --git app/locale/en_US/Mage_Media.csv app/locale/en_US/Mage_Media.csv |index 110331b..504a44a 100644 |--- app/locale/en_US/Mage_Media.csv |+++ app/locale/en_US/Mage_Media.csv

File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored patching file app/locale/en_US/Mage_Uploader.csv patching file downloader/lib/Mage/HTTP/Client/Curl.php patching file js/lib/uploader/flow.min.js patching file js/lib/uploader/fusty-flow-factory.js patching file js/lib/uploader/fusty-flow.js patching file js/mage/adminhtml/product.js patching file js/mage/adminhtml/uploader/instance.js patching file lib/Unserialize/Parser.php patching file lib/Unserialize/Reader/Arr.php patching file lib/Unserialize/Reader/ArrValue.php patching file lib/Unserialize/Reader/Null.php patching file skin/adminhtml/default/default/boxes.css patching file skin/adminhtml/default/default/media/flex.swf patching file skin/adminhtml/default/default/media/uploader.swf patching file skin/adminhtml/default/default/media/uploaderSingle.swf Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file skin/adminhtml/default/default/media/uploaderSingle.swf.rej patching file skin/adminhtml/default/default/xmlconnect/boxes.css

sh PATCH_SUPEE-8788_CE_1.9.2.0_v2-2016-10-14-09-39-55.sh
Checking if patch can be applied/reverted successfully...
ERROR: Patch can't be applied/reverted successfully.
patching file app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php
patching file app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php
patching file app/code/core/Mage/Adminhtml/Block/Media/Uploader.php
patching file app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php
patching file app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php
patching file app/code/core/Mage/Adminhtml/controllers/DashboardController.php
Hunk #1 FAILED at 91.
1 out of 1 hunk FAILED -- saving rejects to file app/code/core/Mage/Adminhtml/controllers/DashboardController.php.rej
patching file app/code/core/Mage/Adminhtml/controllers/IndexController.php
patching file app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php
patching file app/code/core/Mage/Catalog/Helper/Image.php
patching file app/code/core/Mage/Catalog/etc/config.xml
patching file app/code/core/Mage/Catalog/etc/system.xml
patching file app/code/core/Mage/Centinel/Model/Api.php
patching file app/code/core/Mage/Centinel/Model/Api/Client.php
patching file app/code/core/Mage/Core/Block/Abstract.php
patching file app/code/core/Mage/Core/Helper/Url.php
patching file app/code/core/Mage/Core/Model/Encryption.php
patching file app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php
patching file app/code/core/Mage/Core/functions.php
patching file app/code/core/Mage/Customer/Block/Address/Book.php
patching file app/code/core/Mage/Customer/controllers/AddressController.php
patching file app/code/core/Mage/Dataflow/Model/Profile.php
patching file app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
patching file app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
patching file app/code/core/Mage/Downloadable/Helper/File.php
patching file app/code/core/Mage/Oauth/Model/Server.php
patching file app/code/core/Mage/Paygate/Model/Authorizenet.php
patching file app/code/core/Mage/Payment/Block/Info/Checkmo.php
patching file app/code/core/Mage/Paypal/Model/Express/Checkout.php
patching file app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php
patching file app/code/core/Mage/Sales/Model/Resource/Order/Payment.php
patching file app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php
patching file app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php
patching file app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php
patching file app/code/core/Mage/Uploader/Block/Abstract.php
patching file app/code/core/Mage/Uploader/Block/Multiple.php
patching file app/code/core/Mage/Uploader/Block/Single.php
patching file app/code/core/Mage/Uploader/Helper/Data.php
patching file app/code/core/Mage/Uploader/Helper/File.php
patching file app/code/core/Mage/Uploader/Model/Config/Abstract.php
patching file app/code/core/Mage/Uploader/Model/Config/Browsebutton.php
patching file app/code/core/Mage/Uploader/Model/Config/Misc.php
patching file app/code/core/Mage/Uploader/Model/Config/Uploader.php
patching file app/code/core/Mage/Uploader/etc/config.xml
patching file app/code/core/Mage/Uploader/etc/jstranslator.xml
patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php
patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
patching file app/code/core/Mage/Usa/etc/config.xml
patching file app/code/core/Mage/Usa/etc/system.xml
patching file app/code/core/Mage/Wishlist/Helper/Data.php
patching file app/code/core/Mage/Wishlist/controllers/IndexController.php
patching file app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design.php
patching file app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Images.php
patching file app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php
patching file app/design/adminhtml/default/default/layout/cms.xml
patching file app/design/adminhtml/default/default/layout/main.xml
patching file app/design/adminhtml/default/default/layout/xmlconnect.xml
patching file app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml
patching file app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml
patching file app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml
patching file app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml
patching file app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml
patching file app/design/adminhtml/default/default/template/media/uploader.phtml
patching file app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml
patching file app/etc/modules/Mage_All.xml
can't find file to patch at input line 4703
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git app/locale/en_US/Mage_Media.csv app/locale/en_US/Mage_Media.csv
|index 110331b..504a44a 100644
|--- app/locale/en_US/Mage_Media.csv
|+++ app/locale/en_US/Mage_Media.csv
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file app/locale/en_US/Mage_Uploader.csv
patching file downloader/lib/Mage/HTTP/Client/Curl.php
patching file js/lib/uploader/flow.min.js
patching file js/lib/uploader/fusty-flow-factory.js
patching file js/lib/uploader/fusty-flow.js
patching file js/mage/adminhtml/product.js
patching file js/mage/adminhtml/uploader/instance.js
patching file lib/Unserialize/Parser.php
patching file lib/Unserialize/Reader/Arr.php
patching file lib/Unserialize/Reader/ArrValue.php
patching file lib/Unserialize/Reader/Null.php
patching file skin/adminhtml/default/default/boxes.css
patching file skin/adminhtml/default/default/media/flex.swf
patching file skin/adminhtml/default/default/media/uploader.swf
patching file skin/adminhtml/default/default/media/uploaderSingle.swf
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file skin/adminhtml/default/default/media/uploaderSingle.swf.rej
patching file skin/adminhtml/default/default/xmlconnect/boxes.css
 

sh PATCH_SUPEE-8788_CE_1.9.2.0_v2-2016-10-14-09-39-55.sh Checking if patch can be applied/reverted successfully... ERROR: Patch can't be applied/reverted successfully. patching file app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php patching file app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php patching file app/code/core/Mage/Adminhtml/Block/Media/Uploader.php patching file app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php patching file app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php patching file app/code/core/Mage/Adminhtml/controllers/DashboardController.php Hunk #1 FAILED at 91. 1 out of 1 hunk FAILED -- saving rejects to file app/code/core/Mage/Adminhtml/controllers/DashboardController.php.rej patching file app/code/core/Mage/Adminhtml/controllers/IndexController.php patching file app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php patching file app/code/core/Mage/Catalog/Helper/Image.php patching file app/code/core/Mage/Catalog/etc/config.xml patching file app/code/core/Mage/Catalog/etc/system.xml patching file app/code/core/Mage/Centinel/Model/Api.php patching file app/code/core/Mage/Centinel/Model/Api/Client.php patching file app/code/core/Mage/Core/Block/Abstract.php patching file app/code/core/Mage/Core/Helper/Url.php patching file app/code/core/Mage/Core/Model/Encryption.php patching file app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php patching file app/code/core/Mage/Core/functions.php patching file app/code/core/Mage/Customer/Block/Address/Book.php patching file app/code/core/Mage/Customer/controllers/AddressController.php patching file app/code/core/Mage/Dataflow/Model/Profile.php patching file app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php patching file app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php patching file app/code/core/Mage/Downloadable/Helper/File.php patching file app/code/core/Mage/Oauth/Model/Server.php patching file app/code/core/Mage/Paygate/Model/Authorizenet.php patching file app/code/core/Mage/Payment/Block/Info/Checkmo.php patching file app/code/core/Mage/Paypal/Model/Express/Checkout.php patching file app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php patching file app/code/core/Mage/Sales/Model/Resource/Order/Payment.php patching file app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php patching file app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php patching file app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php patching file app/code/core/Mage/Uploader/Block/Abstract.php patching file app/code/core/Mage/Uploader/Block/Multiple.php patching file app/code/core/Mage/Uploader/Block/Single.php patching file app/code/core/Mage/Uploader/Helper/Data.php patching file app/code/core/Mage/Uploader/Helper/File.php patching file app/code/core/Mage/Uploader/Model/Config/Abstract.php patching file app/code/core/Mage/Uploader/Model/Config/Browsebutton.php patching file app/code/core/Mage/Uploader/Model/Config/Misc.php patching file app/code/core/Mage/Uploader/Model/Config/Uploader.php patching file app/code/core/Mage/Uploader/etc/config.xml patching file app/code/core/Mage/Uploader/etc/jstranslator.xml patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php patching file app/code/core/Mage/Usa/etc/config.xml patching file app/code/core/Mage/Usa/etc/system.xml patching file app/code/core/Mage/Wishlist/Helper/Data.php patching file app/code/core/Mage/Wishlist/controllers/IndexController.php patching file app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design.php patching file app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Images.php patching file app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php patching file app/design/adminhtml/default/default/layout/cms.xml patching file app/design/adminhtml/default/default/layout/main.xml patching file app/design/adminhtml/default/default/layout/xmlconnect.xml patching file app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml patching file app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml patching file app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml patching file app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml patching file app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml patching file app/design/adminhtml/default/default/template/media/uploader.phtml patching file app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml patching file app/etc/modules/Mage_All.xml can't find file to patch at input line 4703 Perhaps you used the wrong -p or --strip option? The text leading up to this was:

|diff --git app/locale/en_US/Mage_Media.csv app/locale/en_US/Mage_Media.csv |index 110331b..504a44a 100644 |--- app/locale/en_US/Mage_Media.csv |+++ app/locale/en_US/Mage_Media.csv

File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored patching file app/locale/en_US/Mage_Uploader.csv patching file downloader/lib/Mage/HTTP/Client/Curl.php patching file js/lib/uploader/flow.min.js patching file js/lib/uploader/fusty-flow-factory.js patching file js/lib/uploader/fusty-flow.js patching file js/mage/adminhtml/product.js patching file js/mage/adminhtml/uploader/instance.js patching file lib/Unserialize/Parser.php patching file lib/Unserialize/Reader/Arr.php patching file lib/Unserialize/Reader/ArrValue.php patching file lib/Unserialize/Reader/Null.php patching file skin/adminhtml/default/default/boxes.css patching file skin/adminhtml/default/default/media/flex.swf patching file skin/adminhtml/default/default/media/uploader.swf patching file skin/adminhtml/default/default/media/uploaderSingle.swf Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file skin/adminhtml/default/default/media/uploaderSingle.swf.rej patching file skin/adminhtml/default/default/xmlconnect/boxes.css

sh PATCH_SUPEE-8788_CE_1.9.2.0_v2-2016-10-14-09-39-55.sh
Checking if patch can be applied/reverted successfully...
ERROR: Patch can't be applied/reverted successfully.
patching file app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php
patching file app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php
patching file app/code/core/Mage/Adminhtml/Block/Media/Uploader.php
patching file app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php
patching file app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php
patching file app/code/core/Mage/Adminhtml/controllers/DashboardController.php
Hunk #1 FAILED at 91.
1 out of 1 hunk FAILED -- saving rejects to file app/code/core/Mage/Adminhtml/controllers/DashboardController.php.rej
patching file app/code/core/Mage/Adminhtml/controllers/IndexController.php
patching file app/code/core/Mage/Adminhtml/controllers/Media/UploaderController.php
patching file app/code/core/Mage/Catalog/Helper/Image.php
patching file app/code/core/Mage/Catalog/etc/config.xml
patching file app/code/core/Mage/Catalog/etc/system.xml
patching file app/code/core/Mage/Centinel/Model/Api.php
patching file app/code/core/Mage/Centinel/Model/Api/Client.php
patching file app/code/core/Mage/Core/Block/Abstract.php
patching file app/code/core/Mage/Core/Helper/Url.php
patching file app/code/core/Mage/Core/Model/Encryption.php
patching file app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php
patching file app/code/core/Mage/Core/functions.php
patching file app/code/core/Mage/Customer/Block/Address/Book.php
patching file app/code/core/Mage/Customer/controllers/AddressController.php
patching file app/code/core/Mage/Dataflow/Model/Profile.php
patching file app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
patching file app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
patching file app/code/core/Mage/Downloadable/Helper/File.php
patching file app/code/core/Mage/Oauth/Model/Server.php
patching file app/code/core/Mage/Paygate/Model/Authorizenet.php
patching file app/code/core/Mage/Payment/Block/Info/Checkmo.php
patching file app/code/core/Mage/Paypal/Model/Express/Checkout.php
patching file app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php
patching file app/code/core/Mage/Sales/Model/Resource/Order/Payment.php
patching file app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php
patching file app/code/core/Mage/Sales/Model/Resource/Quote/Payment.php
patching file app/code/core/Mage/Sales/Model/Resource/Recurring/Profile.php
patching file app/code/core/Mage/Uploader/Block/Abstract.php
patching file app/code/core/Mage/Uploader/Block/Multiple.php
patching file app/code/core/Mage/Uploader/Block/Single.php
patching file app/code/core/Mage/Uploader/Helper/Data.php
patching file app/code/core/Mage/Uploader/Helper/File.php
patching file app/code/core/Mage/Uploader/Model/Config/Abstract.php
patching file app/code/core/Mage/Uploader/Model/Config/Browsebutton.php
patching file app/code/core/Mage/Uploader/Model/Config/Misc.php
patching file app/code/core/Mage/Uploader/Model/Config/Uploader.php
patching file app/code/core/Mage/Uploader/etc/config.xml
patching file app/code/core/Mage/Uploader/etc/jstranslator.xml
patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php
patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php
patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
patching file app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
patching file app/code/core/Mage/Usa/etc/config.xml
patching file app/code/core/Mage/Usa/etc/system.xml
patching file app/code/core/Mage/Wishlist/Helper/Data.php
patching file app/code/core/Mage/Wishlist/controllers/IndexController.php
patching file app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design.php
patching file app/code/core/Mage/XmlConnect/Block/Adminhtml/Mobile/Edit/Tab/Design/Images.php
patching file app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php
patching file app/design/adminhtml/default/default/layout/cms.xml
patching file app/design/adminhtml/default/default/layout/main.xml
patching file app/design/adminhtml/default/default/layout/xmlconnect.xml
patching file app/design/adminhtml/default/default/template/catalog/product/helper/gallery.phtml
patching file app/design/adminhtml/default/default/template/cms/browser/content/uploader.phtml
patching file app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable.phtml
patching file app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml
patching file app/design/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml
patching file app/design/adminhtml/default/default/template/media/uploader.phtml
patching file app/design/adminhtml/default/default/template/xmlconnect/edit/tab/design.phtml
patching file app/etc/modules/Mage_All.xml
can't find file to patch at input line 4703
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git app/locale/en_US/Mage_Media.csv app/locale/en_US/Mage_Media.csv
|index 110331b..504a44a 100644
|--- app/locale/en_US/Mage_Media.csv
|+++ app/locale/en_US/Mage_Media.csv
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file app/locale/en_US/Mage_Uploader.csv
patching file downloader/lib/Mage/HTTP/Client/Curl.php
patching file js/lib/uploader/flow.min.js
patching file js/lib/uploader/fusty-flow-factory.js
patching file js/lib/uploader/fusty-flow.js
patching file js/mage/adminhtml/product.js
patching file js/mage/adminhtml/uploader/instance.js
patching file lib/Unserialize/Parser.php
patching file lib/Unserialize/Reader/Arr.php
patching file lib/Unserialize/Reader/ArrValue.php
patching file lib/Unserialize/Reader/Null.php
patching file skin/adminhtml/default/default/boxes.css
patching file skin/adminhtml/default/default/media/flex.swf
patching file skin/adminhtml/default/default/media/uploader.swf
patching file skin/adminhtml/default/default/media/uploaderSingle.swf
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file skin/adminhtml/default/default/media/uploaderSingle.swf.rej
patching file skin/adminhtml/default/default/xmlconnect/boxes.css
 
Source Link
Tank
  • 139
  • 1
  • 10
Loading