diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2019-05-07 11:56:20 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2019-05-07 12:00:22 +0200 |
| commit | 67dbb4f6fd04306fad3d67eb7b848a5204ad6e69 (patch) | |
| tree | 262980c7d3dacc4f5342ca3b8adaf960d26c147f /dev-ros | |
| parent | dev-ros/rosclean: Remove old (diff) | |
| download | gentoo-67dbb4f6fd04306fad3d67eb7b848a5204ad6e69.tar.gz gentoo-67dbb4f6fd04306fad3d67eb7b848a5204ad6e69.tar.bz2 gentoo-67dbb4f6fd04306fad3d67eb7b848a5204ad6e69.zip | |
dev-ros/rosclean: remove patch merged upstream
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'dev-ros')
| -rw-r--r-- | dev-ros/rosclean/files/bb.patch | 26 | ||||
| -rw-r--r-- | dev-ros/rosclean/rosclean-1.14.6.ebuild | 1 | ||||
| -rw-r--r-- | dev-ros/rosclean/rosclean-9999.ebuild | 1 |
3 files changed, 0 insertions, 28 deletions
diff --git a/dev-ros/rosclean/files/bb.patch b/dev-ros/rosclean/files/bb.patch deleted file mode 100644 index e13668f4b774..000000000000 --- a/dev-ros/rosclean/files/bb.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit bbf1f945c7e3a54efca912d38fe8b1b2f5b63988 -Author: Alexis Ballier <aballier@gentoo.org> -Date: Thu Jan 22 09:56:41 2015 +0100 - - rosclean: Use "du -sk * 1024" on Linux for getting disk usage since "du -b" is not supported by busybox du, while "du -k" is supported by both coreutils and busybox. - -diff --git a/tools/rosclean/src/rosclean/__init__.py b/tools/rosclean/src/rosclean/__init__.py -index 5dafb05..6f051f1 100644 ---- a/tools/rosclean/src/rosclean/__init__.py -+++ b/tools/rosclean/src/rosclean/__init__.py -@@ -121,13 +121,13 @@ def get_disk_usage(d): - """ - Get disk usage in bytes for directory - :param d: directory path, ``str`` -- :returns: disk usage in bytes (du -b) or (du -A) * 1024, ``int`` -+ :returns: disk usage in bytes (du -k) * 1024 or (du -A) * 1024, ``int`` - :raises: :exc:`CleanupException` If get_disk_usage() cannot be used on this platform - """ - # only implemented on Linux and FreeBSD for now. Should work on OS X but need to verify first (du is not identical) - if platform.system() == 'Linux': - try: -- return int(subprocess.Popen(['du', '-sb', d], stdout=subprocess.PIPE).communicate()[0].split()[0]) -+ return int(subprocess.Popen(['du', '-sk', d], stdout=subprocess.PIPE).communicate()[0].split()[0]) * 1024 - except: - raise CleanupException("rosclean is not supported on this platform") - elif platform.system() == 'FreeBSD': diff --git a/dev-ros/rosclean/rosclean-1.14.6.ebuild b/dev-ros/rosclean/rosclean-1.14.6.ebuild index d5420ce90d5f..8910f969f5e9 100644 --- a/dev-ros/rosclean/rosclean-1.14.6.ebuild +++ b/dev-ros/rosclean/rosclean-1.14.6.ebuild @@ -19,4 +19,3 @@ RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} test? ( dev-python/nose[${PYTHON_USEDEP}] ) " -PATCHES=( "${FILESDIR}/bb.patch" ) diff --git a/dev-ros/rosclean/rosclean-9999.ebuild b/dev-ros/rosclean/rosclean-9999.ebuild index d5420ce90d5f..8910f969f5e9 100644 --- a/dev-ros/rosclean/rosclean-9999.ebuild +++ b/dev-ros/rosclean/rosclean-9999.ebuild @@ -19,4 +19,3 @@ RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} test? ( dev-python/nose[${PYTHON_USEDEP}] ) " -PATCHES=( "${FILESDIR}/bb.patch" ) |