Author: glen Date: Wed Jun 9 16:38:47 2010 GMT Module: packages Tag: HEAD ---- Log message: - write to homedir if configured files dir not writable (which also defaults to ~/ initially); rel 2
---- Files affected: packages/emesene: emesene.spec (1.15 -> 1.16) , receivedFilesDir-writablecheck.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/emesene/emesene.spec diff -u packages/emesene/emesene.spec:1.15 packages/emesene/emesene.spec:1.16 --- packages/emesene/emesene.spec:1.15 Wed Jun 9 17:53:55 2010 +++ packages/emesene/emesene.spec Wed Jun 9 18:38:42 2010 @@ -1,11 +1,8 @@ # $Revision$, $Date$ -# TODO -# - default download dir (if not reconfigured by user) is /usr/share/emesene, -# which is not writable, set to $HOME/Downloads by default Summary: Instant messaging client for Windows Live Messenger (tm) network Name: emesene Version: 1.6.2 -Release: 1 +Release: 2 License: GPL v2+ Group: Applications/Networking URL: http://www.emesene.org/ @@ -15,6 +12,7 @@ Patch1: setup-install.patch Patch2: plugins-pyc.patch Patch3: pythonpath.patch +Patch4: receivedFilesDir-writablecheck.patch BuildRequires: gettext BuildRequires: python-devel BuildRequires: python-modules @@ -50,6 +48,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cat <<'EOF' > emesene.sh #!/bin/sh @@ -131,6 +130,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.16 2010/06/09 16:38:42 glen +- write to homedir if configured files dir not writable (which also defaults to ~/ initially); rel 2 + Revision 1.15 2010/06/09 15:53:55 glen - todo ================================================================ Index: packages/emesene/receivedFilesDir-writablecheck.patch diff -u /dev/null packages/emesene/receivedFilesDir-writablecheck.patch:1.1 --- /dev/null Wed Jun 9 18:38:47 2010 +++ packages/emesene/receivedFilesDir-writablecheck.patch Wed Jun 9 18:38:42 2010 @@ -0,0 +1,13 @@ +--- emesene-1.6.2/FileTransfer.py~ 2010-05-26 22:51:32.000000000 +0300 ++++ emesene-1.6.2/FileTransfer.py 2010-06-09 19:24:32.826629398 +0300 +@@ -215,8 +215,8 @@ + receivedFilesDir = os.path.expanduser(config.user['receivedFilesDir']) + + # if directory is invalid, save to home directory +- if not os.path.exists(receivedFilesDir): +- print receivedFilesDir + ' does not exist. ' \ ++ if not os.path.exists(receivedFilesDir) or not os.access(receivedFilesDir, os.W_OK): ++ print receivedFilesDir + ' does not exist or is not writable. ' \ + 'Saving files to home directory.' + receivedFilesDir = os.path.expanduser('~/') + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/emesene/emesene.spec?r1=1.15&r2=1.16&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
