Bugzilla – Attachment 75298 Details for
Bug 20428
MARC import fails on Debian Stretch
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20428: (QA follow-up) Remove redundant directory level
Bug-20428-QA-follow-up-Remove-redundant-directory-.patch (text/plain), 2.12 KB, created by
Marcel de Rooy
on 2018-05-14 07:21:29 UTC
(
hide
)
Description:
Bug 20428: (QA follow-up) Remove redundant directory level
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2018-05-14 07:21:29 UTC
Size:
2.12 KB
patch
obsolete
>From 6a2299245ff92b69cd22325c233eb7dc4fbfcb91 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Mon, 14 May 2018 09:05:21 +0200 >Subject: [PATCH] Bug 20428: (QA follow-up) Remove redundant directory level >Content-Type: text/plain; charset=utf-8 > >Upload creates its own upload folder in the temp folder, so there is no >need to add another level in temporary_directory. >Removing the creation of this folder in koha-create-dirs too. > >Also removing the use Koha::UploadedFiles in about.pl. No longer needed. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > Koha/UploadedFile.pm | 5 +---- > about.pl | 1 - > debian/scripts/koha-create-dirs | 1 - > 3 files changed, 1 insertion(+), 6 deletions(-) > >diff --git a/Koha/UploadedFile.pm b/Koha/UploadedFile.pm >index b3b3dfb..a8eb8a3 100644 >--- a/Koha/UploadedFile.pm >+++ b/Koha/UploadedFile.pm >@@ -168,10 +168,7 @@ Returns root directory for temporary storage > > sub temporary_directory { > my ( $class ) = @_; >- my $temporary_directory = ( C4::Context->config('tmp_path') ) >- ? C4::Context->config('tmp_path') . '/uploads' >- : File::Spec->tmpdir; >- return $temporary_directory; >+ return C4::Context->config('tmp_path') || File::Spec->tmpdir; > } > > =head3 _type >diff --git a/about.pl b/about.pl >index c4b0233..308737d 100755 >--- a/about.pl >+++ b/about.pl >@@ -47,7 +47,6 @@ use Koha::Caches; > use Koha::Config::SysPrefs; > use Koha::Illrequest::Config; > use Koha::SearchEngine::Elasticsearch; >-use Koha::UploadedFiles; > > use C4::Members::Statistics; > >diff --git a/debian/scripts/koha-create-dirs b/debian/scripts/koha-create-dirs >index a09d523..822d808 100755 >--- a/debian/scripts/koha-create-dirs >+++ b/debian/scripts/koha-create-dirs >@@ -56,7 +56,6 @@ do > userdir "$name" "/var/lib/koha/$name/plugins" > userdir "$name" "/var/lib/koha/$name/uploads" > userdir "$name" "/var/lib/koha/$name/tmp" >- userdir "$name" "/var/lib/koha/$name/tmp/uploads" > userdir "$name" "/var/lock/koha/$name" > userdir "$name" "/var/lock/koha/$name/authorities" > userdir "$name" "/var/lock/koha/$name/biblios" >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 20428
:
73426
|
73427
|
73428
|
73429
|
73430
|
73431
|
75159
|
75160
|
75161
|
75162
|
75163
|
75164
|
75169
|
75170
|
75171
|
75172
|
75275
|
75279
|
75280
|
75281
|
75282
|
75283
|
75286
|
75293
|
75294
|
75295
|
75296
|
75297
| 75298 |
75305