summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-09-22 13:52:21 +0200
committerAlexis Ballier <aballier@gentoo.org>2015-09-22 13:52:21 +0200
commit8b77dd010a9bd2823db4172fd8418ab3ce9f9f57 (patch)
treea9ab4cf81658377d874d66b882b7e972a061fd78 /dev-ros/rosclean/files
parentdev-ros/rosbuild: Initial import. Ebuild by me. (diff)
downloadgentoo-8b77dd010a9bd2823db4172fd8418ab3ce9f9f57.tar.gz
gentoo-8b77dd010a9bd2823db4172fd8418ab3ce9f9f57.tar.bz2
gentoo-8b77dd010a9bd2823db4172fd8418ab3ce9f9f57.zip
dev-ros/rosclean: Initial import. Ebuild by me.
Package-Manager: portage-2.2.21
Diffstat (limited to 'dev-ros/rosclean/files')
-rw-r--r--dev-ros/rosclean/files/bb.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/dev-ros/rosclean/files/bb.patch b/dev-ros/rosclean/files/bb.patch
new file mode 100644
index 000000000000..e13668f4b774
--- /dev/null
+++ b/dev-ros/rosclean/files/bb.patch
@@ -0,0 +1,26 @@
+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':