Commit 304ad995 authored by Jérome Perrin's avatar Jérome Perrin

all: fix a few cases that eclint fix $filename did not fix

It seems `eclint fix folder/file` sometimes dos not work, but `eclint
fix folder/` worked.
parent c6cc45ab
Pipeline #10839 failed with stage
in 0 seconds
...@@ -15,4 +15,3 @@ ...@@ -15,4 +15,3 @@
[template-apache-backend-conf] [template-apache-backend-conf]
filename = apache-backend.conf.in filename = apache-backend.conf.in
md5sum = 6f51eaa9930e7a7ef959de7c510c7c2f md5sum = 6f51eaa9930e7a7ef959de7c510c7c2f
...@@ -71,4 +71,3 @@ install = ...@@ -71,4 +71,3 @@ install =
extract_dir = self.extract(self.download(*options[guessPlatform()].split())) extract_dir = self.extract(self.download(*options[guessPlatform()].split()))
os.mkdir(location) os.mkdir(location)
shutil.copy(os.path.join(extract_dir, 'chromedriver'), location) shutil.copy(os.path.join(extract_dir, 'chromedriver'), location)
...@@ -28,5 +28,3 @@ entry-points = ...@@ -28,5 +28,3 @@ entry-points =
scripts = scripts =
paster=cloudooo_paster paster=cloudooo_paster
runCloudoooUnitTest runCloudoooUnitTest
[template-fonts-conf] [template-fonts-conf]
filename = fonts.conf.in filename = fonts.conf.in
md5sum = 6967e553630d107fc0a59b14de8b0251 md5sum = 6967e553630d107fc0a59b14de8b0251
...@@ -32,4 +32,3 @@ eggs = ...@@ -32,4 +32,3 @@ eggs =
futures futures
PIL PIL
gateone gateone
...@@ -55,4 +55,3 @@ environment = ...@@ -55,4 +55,3 @@ environment =
# not taken from pkg-config result... # not taken from pkg-config result...
CPPFLAGS=-I${cairo:location}/include -I${inputproto:location}/include -I${libX11:location}/include -I${libXi:location}/include -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${renderext:location}/include -I${libXext:location}/include -I${libX11:location}/include -I${libXinerama:location}/include -I${gdk-pixbuf:location}/include -I${libXrandr:location}/include -I${xfixes:location}/include -I${libXcomposite:location}/include -I${xdamage:location}/include -I${fixesproto:location}/include CPPFLAGS=-I${cairo:location}/include -I${inputproto:location}/include -I${libX11:location}/include -I${libXi:location}/include -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${renderext:location}/include -I${libXext:location}/include -I${libX11:location}/include -I${libXinerama:location}/include -I${gdk-pixbuf:location}/include -I${libXrandr:location}/include -I${xfixes:location}/include -I${libXcomposite:location}/include -I${xdamage:location}/include -I${fixesproto:location}/include
LDFLAGS=-L${libX11:location}/lib -L${libXi:location}/lib -L${libXext:location}/lib -L${libXrender:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXinerama:location}/lib -Wl,-rpath=${libXinerama:location}/lib -L${gdk-pixbuf:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -L${libXrandr:location}/lib -Wl,-rpath=${libXrandr:location}/lib -L${xfixes:location}/lib -Wl,-rpath=${xfixes:location}/lib -L${libXcomposite:location}/lib -Wl,-rpath=${libXcomposite:location}/lib -L${xdamage:location}/lib -Wl,-rpath=${xdamage:location}/lib LDFLAGS=-L${libX11:location}/lib -L${libXi:location}/lib -L${libXext:location}/lib -L${libXrender:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXinerama:location}/lib -Wl,-rpath=${libXinerama:location}/lib -L${gdk-pixbuf:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -L${libXrandr:location}/lib -Wl,-rpath=${libXrandr:location}/lib -L${xfixes:location}/lib -Wl,-rpath=${xfixes:location}/lib -L${libXcomposite:location}/lib -Wl,-rpath=${libXcomposite:location}/lib -L${xdamage:location}/lib -Wl,-rpath=${xdamage:location}/lib
...@@ -102,5 +102,3 @@ input = inline: ...@@ -102,5 +102,3 @@ input = inline:
#!/bin/sh #!/bin/sh
export BUNDLE_GEMFILE=${helloweb-ruby-bundle:path}/Gemfile export BUNDLE_GEMFILE=${helloweb-ruby-bundle:path}/Gemfile
exec ${bundler:bundle} exec sh -c 'helloweb.rb "$@"' ${:_buildout_section_name_} "$@" exec ${bundler:bundle} exec sh -c 'helloweb.rb "$@"' ${:_buildout_section_name_} "$@"
...@@ -6,4 +6,3 @@ parts = ...@@ -6,4 +6,3 @@ parts =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://hyperrealm.github.io/libconfig/dist/libconfig-1.7.2.tar.gz url = https://hyperrealm.github.io/libconfig/dist/libconfig-1.7.2.tar.gz
md5sum = 6bd98ee3a6e6b9126c82c916d7a9e690 md5sum = 6bd98ee3a6e6b9126c82c916d7a9e690
...@@ -26,5 +26,3 @@ configure-options = ...@@ -26,5 +26,3 @@ configure-options =
--without-libinnodb-prefix --without-libinnodb-prefix
--without-libsasl-prefix --without-libsasl-prefix
--without-libsasl2-prefix --without-libsasl2-prefix
...@@ -6,4 +6,3 @@ parts = ...@@ -6,4 +6,3 @@ parts =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://freefr.dl.sourceforge.net/project/lksctp/lksctp-tools/lksctp-tools-1.0.17.tar.gz url = https://freefr.dl.sourceforge.net/project/lksctp/lksctp-tools/lksctp-tools-1.0.17.tar.gz
md5sum = 68e9b8fa4d4e331029b247b72d46d7a5 md5sum = 68e9b8fa4d4e331029b247b72d46d7a5
...@@ -20,4 +20,3 @@ make-options = ...@@ -20,4 +20,3 @@ make-options =
environment = environment =
PATH=${bison:location}/bin:${flex:location}/bin:%(PATH)s PATH=${bison:location}/bin:${flex:location}/bin:%(PATH)s
...@@ -136,4 +136,3 @@ component = vbucketmigrator ...@@ -136,4 +136,3 @@ component = vbucketmigrator
component-configure-options = component-configure-options =
--without-sasl --without-sasl
--with-isasl --with-isasl
...@@ -127,4 +127,3 @@ template = inline: ...@@ -127,4 +127,3 @@ template = inline:
mode = 0755 mode = 0755
rendered = ${buildout:bin-directory}/${:_buildout_section_name_} rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
perl-bin = ${:rendered} perl-bin = ${:rendered}
...@@ -42,5 +42,3 @@ environment = ...@@ -42,5 +42,3 @@ environment =
CPPFLAGS=${:CMAKE_CFLAGS} CPPFLAGS=${:CMAKE_CFLAGS}
LDFLAGS=-L${bzip2:location}/lib -L${mbedtls:location}/lib -L${lksctp-tools:location}/lib -L${libconfig:location}/lib -L${boost-lib:location}/lib -L${fftw3:location}/lib LDFLAGS=-L${bzip2:location}/lib -L${mbedtls:location}/lib -L${lksctp-tools:location}/lib -L${libconfig:location}/lib -L${boost-lib:location}/lib -L${fftw3:location}/lib
PATH=${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH=${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
...@@ -50,4 +50,3 @@ recipe = slapos.recipe.build:download ...@@ -50,4 +50,3 @@ recipe = slapos.recipe.build:download
destination = ${tesseract-traineddata:location}/tessdata/osd.traineddata destination = ${tesseract-traineddata:location}/tessdata/osd.traineddata
url = https://github.com/tesseract-ocr/tessdata/raw/590567f20dc044f6948a8e2c61afc714c360ad0e/osd.traineddata url = https://github.com/tesseract-ocr/tessdata/raw/590567f20dc044f6948a8e2c61afc714c360ad0e/osd.traineddata
md5sum = 7611737524efd1ce2dde67eff629bbcf md5sum = 7611737524efd1ce2dde67eff629bbcf
...@@ -24,4 +24,3 @@ md5sum = 2a2c066d7d40dd8545f3008f434ee842 ...@@ -24,4 +24,3 @@ md5sum = 2a2c066d7d40dd8545f3008f434ee842
[proftpd-config-file] [proftpd-config-file]
filename = proftpd-config-file.cfg.in filename = proftpd-config-file.cfg.in
md5sum = a7c0f4607c378b640379cc258a8aadfa md5sum = a7c0f4607c378b640379cc258a8aadfa
...@@ -16,4 +16,3 @@ ...@@ -16,4 +16,3 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = 47eb5f8e6f56729e2ce0e6213bccf4f7 md5sum = 47eb5f8e6f56729e2ce0e6213bccf4f7
...@@ -86,4 +86,4 @@ md5sum = 75aab99c995ca841f93fc77fc9116c37 ...@@ -86,4 +86,4 @@ md5sum = 75aab99c995ca841f93fc77fc9116c37
[template-buildout-shared-part-list] [template-buildout-shared-part-list]
filename = template/buildout-shared-part-list.in filename = template/buildout-shared-part-list.in
md5sum = 3203c9ad0b30d3ee39a809a067efff8d md5sum = f619c8c5897c4851442b7090c8509758
...@@ -52,4 +52,3 @@ md5sum = 869cca5a1c87a9766d0650f4ef374dc1 ...@@ -52,4 +52,3 @@ md5sum = 869cca5a1c87a9766d0650f4ef374dc1
[config-user_db] [config-user_db]
filename = config/user_db.csv filename = config/user_db.csv
md5sum = e37cd54eb08de3202cc0250437a2f181 md5sum = e37cd54eb08de3202cc0250437a2f181
...@@ -54,5 +54,3 @@ recipe = slapos.recipe.template ...@@ -54,5 +54,3 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
output = ${buildout:directory}/instance-stack.cfg output = ${buildout:directory}/instance-stack.cfg
mode = 0644 mode = 0644
...@@ -96,4 +96,3 @@ context = ...@@ -96,4 +96,3 @@ context =
[versions] [versions]
cns.recipe.symlink = 0.2.3 cns.recipe.symlink = 0.2.3
...@@ -59,4 +59,3 @@ md5sum = fa6521daaa02fef4dd2ce06d29ef90be ...@@ -59,4 +59,3 @@ md5sum = fa6521daaa02fef4dd2ce06d29ef90be
[template-monitor-check-resilient-feed] [template-monitor-check-resilient-feed]
filename = templates/monitor-check-resilient-feed.in filename = templates/monitor-check-resilient-feed.in
md5sum = af9787f8440fef19924b2e765372b20f md5sum = af9787f8440fef19924b2e765372b20f
...@@ -19,4 +19,3 @@ md5sum = 163c9f60e4ad3842162cbb11d771b7b8 ...@@ -19,4 +19,3 @@ md5sum = 163c9f60e4ad3842162cbb11d771b7b8
[supervisord-conf] [supervisord-conf]
_update_hash_filename_ = supervisord.conf.in _update_hash_filename_ = supervisord.conf.in
md5sum = d624f65151233493c6dbdafa83ae8cbd md5sum = d624f65151233493c6dbdafa83ae8cbd
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment