FreeBSD Bugzilla – Attachment 179530 Details for
Bug 216729
sysutils/py-diffoscope: update to version 71
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
py-diffoscope update to v70
diffoscope-70.diff (text/plain), 3.31 KB, created by
Ed Maste
on 2017-02-02 15:48:17 UTC
(
hide
)
Description:
py-diffoscope update to v70
Filename:
MIME Type:
Creator:
Ed Maste
Created:
2017-02-02 15:48:17 UTC
Size:
3.31 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 424769) >+++ Makefile (working copy) >@@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= diffoscope >-PORTVERSION= 59 >+PORTVERSION= 70 > CATEGORIES= sysutils python > MASTER_SITES= CHEESESHOP > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} >Index: distinfo >=================================================================== >--- distinfo (revision 424769) >+++ distinfo (working copy) >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1471591876 >-SHA256 (diffoscope-59.tar.gz) = 78be510ba9a3cbe4301288cd8ccd686e8694e2baae9119e2cc612a3b18ae3a26 >-SIZE (diffoscope-59.tar.gz) = 400860 >+TIMESTAMP = 1486050153 >+SHA256 (diffoscope-70.tar.gz) = 540e992bac412099f601ea50287fa73bbdb9c85ee19974a94fd1b92dc7b1a8b5 >+SIZE (diffoscope-70.tar.gz) = 452797 >Index: files/patch-diffoscope_comparators_directory.py >=================================================================== >--- files/patch-diffoscope_comparators_directory.py (revision 424769) >+++ files/patch-diffoscope_comparators_directory.py (nonexistent) >@@ -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] >- >- > >Property changes on: files/patch-diffoscope_comparators_directory.py >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property
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
Attachments on
bug 216729
:
179530
|
179733