diff --git a/other/.empty_on_purpose b/other/.empty_on_purpose new file mode 100644 index 0000000..da3366b --- /dev/null +++ b/other/.empty_on_purpose @@ -0,0 +1,9 @@ +If you're reading this file, that means that you found a directory that +is empty by default when Wicd is installed. Congratulations! + +At this point, the directory probably isn't empty, so perhaps the name +of this file is a little confusing. + +Some package managers and some version control systems don't allow for +installation or storage of empty directories, so this file exists to +make them work properly. Just ignore it and continue on with your life. diff --git a/setup.py b/setup.py index 8a11b83..edb732e 100644 --- a/setup.py +++ b/setup.py @@ -485,24 +485,28 @@ py_modules=['wicd.networking','wicd.misc','wicd.wnettools', 'wicd.logfile','wicd.backend','wicd.configmanager', 'wicd.translations'] +# path to the file to put in empty directories +# fixes https://bugs.launchpad.net/wicd/+bug/503028 +empty_file = 'other/.empty_on_purpose' + try: print "Using init file",(wpath.init, wpath.initfile) data = [ (wpath.dbus, ['other/wicd.conf']), - (wpath.log, []), + (wpath.log, [empty_file]), (wpath.etc, ['other/dhclient.conf.template.default']), (wpath.encryption, [('encryption/templates/' + b) for b in os.listdir('encryption/templates') if not b.startswith('.')]), - (wpath.networks, []), + (wpath.networks, [empty_file]), (wpath.sbin, ['scripts/wicd']), (wpath.daemon, ['wicd/monitor.py', 'wicd/wicd-daemon.py', 'wicd/suspend.py', 'wicd/autoconnect.py']), (wpath.backends, ['wicd/backends/be-external.py', 'wicd/backends/be-ioctl.py']), - (wpath.scripts, []), - (wpath.predisconnectscripts, []), - (wpath.postdisconnectscripts, []), - (wpath.preconnectscripts, []), - (wpath.postconnectscripts, []), + (wpath.scripts, [empty_file]), + (wpath.predisconnectscripts, [empty_file]), + (wpath.postdisconnectscripts, [empty_file]), + (wpath.preconnectscripts, [empty_file]), + (wpath.postconnectscripts, [empty_file]), ] if not wpath.no_install_gtk: data.append((wpath.desktop, ['other/wicd.desktop']))