Page MenuHomeFreeBSD
Files F154315765

D9085.id.diff
No OneTemporary
Actions

D9085.id.diff
View Options

Index: head/sysutils/py-diffoscope/Makefile
===================================================================
--- head/sysutils/py-diffoscope/Makefile
+++ head/sysutils/py-diffoscope/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= diffoscope
-PORTVERSION= 59
+PORTVERSION= 67
CATEGORIES= sysutils python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -25,8 +25,6 @@
NO_ARCH= yes
-# mount -t fdescfs fdesc /dev/fd before running tests
-
do-test:
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test --pytest-args="-rsx -l -vv"
Index: head/sysutils/py-diffoscope/distinfo
===================================================================
--- head/sysutils/py-diffoscope/distinfo
+++ head/sysutils/py-diffoscope/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471591876
-SHA256 (diffoscope-59.tar.gz) = 78be510ba9a3cbe4301288cd8ccd686e8694e2baae9119e2cc612a3b18ae3a26
-SIZE (diffoscope-59.tar.gz) = 400860
+TIMESTAMP = 1483829567
+SHA256 (diffoscope-67.tar.gz) = 96f17de536f411e69d2944191a8860b5c8be22a7f5a6a5d4ea3d34cc94badbf7
+SIZE (diffoscope-67.tar.gz) = 488185
Index: head/sysutils/py-diffoscope/files/patch-diffoscope_comparators_directory.py
===================================================================
--- head/sysutils/py-diffoscope/files/patch-diffoscope_comparators_directory.py
+++ head/sysutils/py-diffoscope/files/patch-diffoscope_comparators_directory.py
@@ -1,47 +0,0 @@
---- diffoscope/comparators/directory.py.orig 2016-01-30 11:54:52 UTC
-+++ diffoscope/comparators/directory.py
-@@ -72,8 +72,11 @@ def lsattr(path):
- class Getfacl(Command):
- @tool_required('getfacl')
- def cmdline(self):
-- return ['getfacl', '-p', '-c', self.path]
--
-+ osname = os.uname()[0]
-+ if osname == 'Linux':
-+ return ['getfacl', '-p', '-c', self.path]
-+ else: # FreeBSD
-+ return ['getfacl', '-q', '-h', self.path]
-
- def compare_meta(path1, path2):
- logger.debug('compare_meta(%s, %s)', path1, path2)
-@@ -84,17 +87,19 @@ def compare_meta(path1, path2):
- logger.warn("'stat' not found! Is PATH wrong?")
- if os.path.islink(path1) or os.path.islink(path2):
- return [d for d in differences if d is not None]
-- try:
-- lsattr1 = lsattr(path1)
-- lsattr2 = lsattr(path2)
-- differences.append(Difference.from_text(
-- lsattr1, lsattr2, path1, path2, source="lattr"))
-- except RequiredToolNotFound:
-- logger.info("Unable to find 'lsattr'.")
-- try:
-- differences.append(Difference.from_command(Getfacl, path1, path2))
-- except RequiredToolNotFound:
-- logger.info("Unable to find 'getfacl'.")
-+ osname = os.uname()[0]
-+ if osname == "Linux" or osname == "FreeBSD":
-+ try:
-+ lsattr1 = lsattr(path1)
-+ lsattr2 = lsattr(path2)
-+ differences.append(Difference.from_text(
-+ lsattr1, lsattr2, path1, path2, source="lattr"))
-+ except RequiredToolNotFound:
-+ logger.info("Unable to find 'lsattr'.")
-+ try:
-+ differences.append(Difference.from_command(Getfacl, path1, path2))
-+ except RequiredToolNotFound:
-+ logger.info("Unable to find 'getfacl'.")
- return [d for d in differences if d is not None]
-
-
Index: head/sysutils/py-diffoscope/pkg-message
===================================================================
--- head/sysutils/py-diffoscope/pkg-message
+++ head/sysutils/py-diffoscope/pkg-message
@@ -1,12 +0,0 @@
-===========================================================================
-
- diffoscope currently relies on /dev/fd. To enable this feature on your
- system, run:
-
- # mount -t fdescfs fdesc /dev/fd
-
- To make it permanent, add the to /etc/fstab:
-
- fdesc /dev/fd fdescfs rw 0 0
-
-===========================================================================

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 28, 7:14 PM (6 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32300750
Default Alt Text
D9085.id.diff (3 KB)

Event Timeline