ranger: Update from 1.8.1 to 1.9.0

This commit is contained in:
Fredrik Fornwall 2018-01-29 10:38:31 +01:00
parent a83f7ab3d6
commit b490abcff2
2 changed files with 25 additions and 27 deletions

View File

@ -1,8 +1,8 @@
TERMUX_PKG_HOMEPAGE=http://ranger.nongnu.org/
TERMUX_PKG_HOMEPAGE=https://ranger.github.io/
TERMUX_PKG_DESCRIPTION="File manager with VI key bindings"
TERMUX_PKG_VERSION=1.8.1
TERMUX_PKG_SRCURL=http://ranger.nongnu.org/ranger-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=1433f9f9958b104c97d4b23ab77a2ac37d3f98b826437b941052a55c01c721b4
TERMUX_PKG_VERSION=1.9.0
TERMUX_PKG_SHA256=fe1e11a24cb14148b26977a38160bb5f9fe255c5a0f211d1b0359103cea7c617
TERMUX_PKG_SRCURL=https://github.com/ranger/ranger/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_DEPENDS="python, file"
TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_PLATFORM_INDEPENDENT=yes

View File

@ -1,32 +1,30 @@
Hard links do not work on Android starting from 6.0.
diff -u -r ../ranger-1.7.2/ranger/core/actions.py ./ranger/core/actions.py
--- ../ranger-1.7.2/ranger/core/actions.py 2015-10-03 19:46:45.000000000 -0400
+++ ./ranger/core/actions.py 2015-11-28 17:30:53.302748825 -0500
@@ -8,7 +8,7 @@
import string
import tempfile
from os.path import join, isdir, realpath, exists
diff -u -r ../ranger-1.9.0/ranger/core/actions.py ./ranger/core/actions.py
--- ../ranger-1.9.0/ranger/core/actions.py 2018-01-28 19:02:32.000000000 +0000
+++ ./ranger/core/actions.py 2018-01-29 09:26:24.869712282 +0000
@@ -7,7 +7,7 @@
import codecs
import os
-from os import link, symlink, getcwd, listdir, stat
+from os import symlink, getcwd, listdir, stat
from inspect import cleandoc
from stat import S_IEXEC
from hashlib import sha1
@@ -1191,7 +1191,7 @@
for f in self.copy_buffer:
from os.path import join, isdir, realpath, exists
import re
import shlex
@@ -1383,7 +1383,7 @@
for fobj in self.copy_buffer:
new_name = next_available_filename(fobj.basename)
try:
new_name = next_available_filename(f.basename)
- link(f.path, join(getcwd(), new_name))
+ symlink(f.path, join(getcwd(), new_name))
except Exception as x:
self.notify(x)
@@ -1214,7 +1214,7 @@
- link(fobj.path, join(getcwd(), new_name))
+ symlink(fobj.path, join(getcwd(), new_name))
except OSError as ex:
self.notify('Failed to paste hardlink: View log for more info',
bad=True, exception=ex)
@@ -1408,7 +1408,7 @@
else:
if not exists(target_path) \
or stat(source_path).st_ino != stat(target_path).st_ino:
or stat(source_path).st_ino != stat(target_path).st_ino:
- link(source_path,
+ symlink(source_path,
next_available_filename(target_path))
next_available_filename(target_path))
def paste(self, overwrite=False, append=False):