From df86e084563ff7d7483ccde93b87e21aa71729cc Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 25 May 2018 16:16:47 +0200 Subject: [PATCH] no change, removed EOL spaces --- Makefile | 44 ++++++++++++++++++++--------------------- sfa/server/xmlrpcapi.py | 1 - 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 02bab1b8..23c1be31 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,15 @@ # -## (Re)builds Python metafile (__init__.py) -# +## (Re)builds Python metafile (__init__.py) +# # overwritten by the specfile DESTDIR="/" PREFIX=/usr ########## -all: python wsdl +all: python wsdl install: python-install wsdl-install tests-install -clean: python-clean wsdl-clean +clean: python-clean wsdl-clean uninstall: python-uninstall tests-uninstall @@ -25,7 +25,7 @@ SCMURL=git://git.onelab.eu/sfa.git python: version -version: sfa/util/version.py +version: sfa/util/version.py sfa/util/version.py: sfa/util/version.py.in force sed -e "s,@VERSIONTAG@,$(VERSIONTAG),g" -e "s,@SCMURL@,$(SCMURL),g" sfa/util/version.py.in > $@ @@ -44,14 +44,14 @@ python-clean: version-clean version-clean: rm -f sfa/util/version.py -.PHONY: python version python-install python-clean version-clean +.PHONY: python version python-install python-clean version-clean ########## -wsdl: - $(MAKE) -C wsdl +wsdl: + $(MAKE) -C wsdl # propagate DESTDIR from the specfile wsdl-install: - $(MAKE) -C wsdl install + $(MAKE) -C wsdl install wsdl-clean: $(MAKE) -C wsdl clean @@ -59,7 +59,7 @@ wsdl-clean: .PHONY: wsdl wsdl-install wsdl-clean ######################################## debian packaging -# The 'debian' target is called from the build with the following variables set +# The 'debian' target is called from the build with the following variables set # (see build/Makefile and target_debian) # (.) RPMTARBALL # (.) RPMVERSION @@ -77,11 +77,11 @@ debian: debian/changelog debian.source debian.package debian/changelog: debian/changelog.in sed -e "s|@VERSION@|$(DEBVERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog -debian.source: force +debian.source: force rsync -a $(RPMTARBALL) $(DEBTARBALL) debian.package: - debuild -uc -us -b + debuild -uc -us -b debian.clean: $(MAKE) -f debian/rules clean @@ -100,7 +100,7 @@ tests-uninstall: ########## refreshing methods package metafile # Metafiles - manage Legacy/ and Accessors by hand -init := sfa/methods/__init__.py +init := sfa/methods/__init__.py index: $(init) @@ -115,7 +115,7 @@ methods_files := $(sort $(notdir $(methods_paths:.py=))) ifneq ($(methods_now),$(methods_files)) sfa/methods/__init__.py: force endif -sfa/methods/__init__.py: +sfa/methods/__init__.py: (echo '## Please use make index to update this file' ; echo 'all = """' ; cd sfa/methods; ls -1 *.py | grep -v __init__ | sed -e 's,.py$$,,' ; echo '""".split()') > $@ force: @@ -123,12 +123,12 @@ force: ########## # a lot of stuff in the working dir is just noise files: - @find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|dg|pickle)$$' + @find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|dg|pickle)$$' git-files: @git ls-files | egrep -v '\.(doc|html|pdf)$$' -tags: +tags: $(MAKE) git-files | xargs etags .PHONY: files tags @@ -149,7 +149,7 @@ PYPI_TARBALL_TOPDIR=/build/sfa # and I could not find out why # so I went for the manual method instead # there also was a web dialog prompting for a zip file that would -# be used to initialize the project's home dir but this too +# be used to initialize the project's home dir but this too # did not seem to work the way I was trying to use it, so ... # this target is still helpful to produce the readme in html from README.md @@ -161,7 +161,7 @@ index.zip index.html: README.md # we need to re-run make so the version is right git_pypi: git pypi -git: +git: git pull $(MAKE) version @@ -200,7 +200,7 @@ endif endif endif -synccheck: +synccheck: ifeq (,$(SSHURL)) @echo "sync: I need more info from the command line, e.g." @echo " make sync PLC=boot.planetlab.eu" @@ -209,7 +209,7 @@ ifeq (,$(SSHURL)) @exit 1 endif -LOCAL_RSYNC_EXCLUDES += --exclude '*.pyc' +LOCAL_RSYNC_EXCLUDES += --exclude '*.pyc' LOCAL_RSYNC_EXCLUDES += --exclude '*.png' --exclude '*.svg' --exclude '*.out' RSYNC_EXCLUDES := --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES) RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,) @@ -260,9 +260,9 @@ sfa/examples/miniclient.py \ sfa/__init__.py \ sfa/client/{sfaserverproxy,sfaclientlib,__init__}.py \ sfa/trust/{certificate,__init__}.py \ -sfa/util/{sfalogging,faults,genicode,enumeration,__init__}.py +sfa/util/{sfalogging,faults,genicode,enumeration,__init__}.py -clientlibsync: +clientlibsync: @[ -d "$(CLIENTLIBTARGET)" ] || { echo "You need to set the make variable CLIENTLIBTARGET"; exit 1; } rsync -av --relative $(CLIENTLIBFILES) $(CLIENTLIBTARGET) diff --git a/sfa/server/xmlrpcapi.py b/sfa/server/xmlrpcapi.py index 51893285..f3d4e680 100644 --- a/sfa/server/xmlrpcapi.py +++ b/sfa/server/xmlrpcapi.py @@ -15,7 +15,6 @@ except ImportError: SOAPpy = None #################### -#from sfa.util.faults import SfaNotImplemented, SfaAPIError, SfaInvalidAPIMethod, SfaFault from sfa.util.faults import SfaInvalidAPIMethod, SfaAPIError, SfaFault from sfa.util.sfalogging import logger from sfa.util.py23 import xmlrpc_client -- 2.43.0