Accepting request 22286 from Base:System

Copy from Base:System/mc based on submit request 22286 from user prusnak

OBS-URL: https://build.opensuse.org/request/show/22286
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=17
This commit is contained in:
OBS User autobuild 2009-10-12 18:58:02 +00:00 committed by Git OBS Bridge
parent 9528db6c60
commit 9b7e3734d1
3 changed files with 46 additions and 1 deletions

37
mc-mkdir_mc_home.patch Normal file
View File

@ -0,0 +1,37 @@
--- src/main.c 2009-10-10 22:21:47.000000000 +0200
+++ src/main.c 2009-10-11 12:05:35.000000000 +0200
@@ -62,6 +62,7 @@
#include "listmode.h"
#include "execute.h"
#include "ext.h" /* For flush_extension_file() */
+#include "fileloc.h"
/* Listbox for the command history feature */
#include "widget.h"
@@ -2129,8 +2130,10 @@
int
main (int argc, char *argv[])
{
+ struct stat s;
/* Check whether we have UTF-8 locale */
char *lang = getenv("LANG");
+ char *mc_dir;
size_t len = 0;
if ( lang )
@@ -2201,6 +2204,15 @@
init_xterm_support ();
+ /* create home directory */
+ mc_dir = mhl_str_dir_plus_file (home_dir, MC_USERCONF_DIR);
+ canonicalize_pathname (mc_dir);
+ if ((stat (mc_dir, &s) != 0) && (errno == ENOENT) && mkdir (mc_dir, 0700) != 0)
+ message (D_ERROR, _("Warning"),
+ _("Cannot create %s directory"), mc_dir);
+ g_free (mc_dir);
+
+
#ifdef HAVE_SUBSHELL_SUPPORT
/* Done here to ensure that the subshell doesn't */

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Oct 11 10:16:07 UTC 2009 - mseben@novell.com
- added mc-mkdir_mc_home.patch - create .mc home dir at startup (bnc#533262)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 13 21:22:27 CEST 2009 - coolo@novell.com Mon Jul 13 21:22:27 CEST 2009 - coolo@novell.com

View File

@ -26,7 +26,7 @@ Group: Productivity/File utilities
PreReq: permissions PreReq: permissions
AutoReqProv: on AutoReqProv: on
Version: 4.6.2 Version: 4.6.2
Release: 5 Release: 6
Summary: Midnight Commander Summary: Midnight Commander
Source: mc-4.6.2.tar.bz2 Source: mc-4.6.2.tar.bz2
Source1: x11_browser Source1: x11_browser
@ -70,6 +70,8 @@ Patch42: mc-utf8-slang-codeset.patch
Patch43: mc-crash-bnc500516.patch Patch43: mc-crash-bnc500516.patch
# PATCH-FIX-UPSTREAM mc-port-number-bnc483249.patch nadvornik@suse.cz - port number in shell link - midnight-commander.org/ticket/118 # PATCH-FIX-UPSTREAM mc-port-number-bnc483249.patch nadvornik@suse.cz - port number in shell link - midnight-commander.org/ticket/118
Patch44: mc-port-number-bnc483249.patch Patch44: mc-port-number-bnc483249.patch
# PATCH-FIX-UPSTREAM mc-mkdir_mc_home.patch mseben@suse.cz - create .mc home dir at startup (bnc#533262)
Patch45: mc-mkdir_mc_home.patch
# #
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.ibiblio.org/mc/ Url: http://www.ibiblio.org/mc/
@ -133,6 +135,7 @@ target directory.
%patch42 -p1 %patch42 -p1
%patch43 %patch43
%patch44 -p1 %patch44 -p1
%patch45
pushd po pushd po
rename no nb no.* rename no nb no.*
popd popd