Guilliam Xavier
2f4bd85219
ValidateCommand: de-invert if-elseif-else to reduce code duplication
2020-02-13 14:57:38 +01:00
Guilliam Xavier
901d177179
ValidateCommand: factorize $printSchemaUrl code
2020-02-13 14:46:50 +01:00
Guilliam Xavier
b5e41d6792
ValidateCommand: always display all warnings, independently of --strict
2020-02-13 14:43:26 +01:00
Guilliam Xavier
7e2679ffc1
ValidateCommand: pass $isStrict to outputResult() of with-dependencies too
2020-02-13 14:37:08 +01:00
Stephan Vock
243ee9b1e4
Git: log error for sync mirror with existing local copy
2020-02-12 10:17:21 +00:00
Jordi Boggiano
4d74f5ba95
Fix exclude-from-classmap handling to avoid foo matching foo* directories, fixes #8563 , refs #8575
2020-02-12 10:23:03 +01:00
Jordi Boggiano
02433c3659
Merge pull request #8565 from glaubinix/t/create-project-add-repository
...
Create project: add option to add the repository to the composer.json
2020-02-11 13:47:34 +01:00
Ion Bazan
a180f48921
Distinguish between updates and downgrades in dry-run
2020-02-11 16:35:35 +08:00
Stephan Vock
2a564a9f36
Create project: add option to add the repository to the composer.json
2020-02-10 16:46:28 +00:00
Jordi Boggiano
5843a282bc
Merge pull request #8562 from adrianosferreira/fix-archive-format-cli
...
Uses config data from Composer object whenever possible on ArchiveCommand
2020-02-10 17:26:26 +01:00
Adriano Ferreira
97d077c43b
Uses config data from Composer object whenever possible on ArchiveCommand
...
It was previously blindly getting a new instance from the factory thus ignoring what is on Composer object config data.
2020-02-10 13:15:58 -02:00
Jordi Boggiano
c56886ac36
Avoid checking for .dockerenv if open_basedir is set, fixes #8585
2020-02-07 22:33:39 +01:00
Ion Bazan
2ff73a8797
respect `notify-on-install` option
2020-02-05 15:52:14 +08:00
Jordi Boggiano
94dce37424
Avoid use of refs and avoid a false path when showing the root package, refs #8545
2020-01-28 13:52:34 +01:00
Jordi Boggiano
9db08f9883
Merge remote-tracking branch 'Serializator/feature/show-package-json'
2020-01-28 12:57:34 +01:00
Jordi Boggiano
e9c7e253f4
Merge pull request #8529 from vitalyzhakov/master
...
Change only modified files for docker caching
2020-01-28 11:31:40 +01:00
Jordi Boggiano
1287a7a611
Merge pull request #8538 from adrianosferreira/add-vendor-bin-for-each-event
...
Append the bin dir on each listener iteration
2020-01-28 11:29:22 +01:00
Julian van den Berkmortel
933fe27cd5
Add support for "composer show --format=json <package>" #8544
2020-01-21 23:07:54 +01:00
Жаков Виталий
ccd8be382b
comments for #2764
2020-01-21 11:10:18 +05:00
Жаков Виталий
415cf9fd50
Merge branch 'master' of https://github.com/composer/composer
2020-01-21 11:06:56 +05:00
Жаков Виталий
48c7442b63
should be || not OR
2020-01-20 16:25:38 +05:00
Adriano Ferreira
acc040f745
Append the bin dir on each listener iteration
...
The "composer install" can create the vendor/dir folders and be used as a script item on composer.json. Having another script running after it that relies on vendor/bir binaries (such as phpunit) will cause it to not find the binary. This fix addresses the issue by trying to append the path on each script iteration.
2020-01-20 08:11:08 -02:00
Жаков Виталий
1e92780600
operations case touch
2020-01-17 19:37:39 +05:00
Patrick Weyck
7d7e3d594b
Normalize minimum-stability `rc` to `RC` in `InitCommand`
...
A `minimum-stability` of `rc` is valid according to
`composer-schema.json` and works fine with install and update and
generally in version comparisons, because it's normalized to `RC`.
This commit makes it work in `InitCommand` and `RequireCommand` too.
2020-01-17 15:34:18 +01:00
Jordi Boggiano
b9d00153d9
Suggest using -p when a platform package can not be found in show command
2020-01-17 14:52:07 +01:00
Жаков Виталий
33db6ec71b
touch only if update
2020-01-17 10:58:52 +05:00
Жаков Виталий
f02989ceba
revert formatting
2020-01-15 18:27:12 +05:00
Жаков Виталий
a4dc076dc8
fix file load errors
2020-01-15 18:09:42 +05:00
Жаков Виталий
8429a48dac
Change only modified files
2020-01-15 17:09:44 +05:00
Jordi Boggiano
e4b495ca16
Fix 5.3 build
2020-01-14 15:42:43 +01:00
Jordi Boggiano
4b6c25d4bc
Use Authorization header instead of deprecated access_token query param, fixes #8454
2020-01-14 15:35:52 +01:00
Jordi Boggiano
c3d3d45903
Merge pull request #8331 from jimmy-ho/bug/issue-8330
...
8330 Correct issue where permission umask of files were not set when …
2020-01-14 15:09:28 +01:00
Jordi Boggiano
669033f1e7
Collect existing packages only once, refs #8372
2020-01-14 14:45:15 +01:00
Jordi Boggiano
c0714e5ff8
Merge remote-tracking branch 'xy2z/has-package-name'
2020-01-14 14:33:01 +01:00
Jordi Boggiano
78217e2313
Merge branch '1.9'
2020-01-14 12:52:32 +01:00
Jordi Boggiano
a2dadb91bf
Return two packages in PathRepository when on a feature branch, one for feature branch and one for the source branch it came from, fixes #8498 , fixes #8477
2020-01-14 12:52:20 +01:00
Jordi Boggiano
6c795dedc0
Add openssl version to diagnose command, refs #8506
2020-01-14 09:36:53 +01:00
Jordi Boggiano
a902279a5b
Merge branch '1.9'
2020-01-14 09:32:27 +01:00
Jordi Boggiano
0b767e0b83
Allow calling getProviderNames multiple times, refs #8516
2020-01-14 09:31:57 +01:00
Maximilian Bösing
3791a574a2
Provide partial packages names if available, closes #8516 , fixes #8526
2020-01-14 09:31:57 +01:00
Jordi Boggiano
f5dab18b7d
Remove dead code, refs #8517
2020-01-13 18:21:57 +01:00
Jordi Boggiano
ee3fd0f745
Merge remote-tracking branch 'adrianosferreira/package-install-method-cli'
...
Fixed formatting, and handling of config command to be preferred-install.foo value
Refs #8517
2020-01-13 18:18:18 +01:00
Jordi Boggiano
e8426d2c01
Adjust config handling of suggest, refs #8520
2020-01-13 17:51:38 +01:00
Jordi Boggiano
f203b3eb41
Merge remote-tracking branch 'adrianosferreira/add-suggest-in-json-by-cli'
2020-01-13 17:36:10 +01:00
Jordi Boggiano
c43137db3f
Merge branch '1.9'
2020-01-13 15:50:39 +01:00
Jordi Boggiano
8d24b61bef
Tweak and add comments to the working dir fix with global exec, refs #8515
2020-01-13 15:50:34 +01:00
Jordi Boggiano
6b8f1c71b6
Merge remote-tracking branch 'cdayjr/issue-8481'
2020-01-13 15:31:22 +01:00
Jordi Boggiano
ef6ef8ac0f
Hint at the partial update command, fixes #8508 , refs #8332
2020-01-13 14:19:37 +01:00
Jordi Boggiano
818e16238f
Merge pull request #8510 from glaubinix/t/abandon-archived
...
VcsRepositories: mark archived repositories as abandoned
2020-01-13 13:47:33 +01:00
Jordi Boggiano
3d72b56ed6
Merge branch '1.9'
2020-01-13 13:30:52 +01:00
Jordi Boggiano
d3f1c664d4
Avoid formatting output from external processes, fixes #8524
2020-01-13 13:30:46 +01:00
Adriano Ferreira
607d491921
Implemented way to add packages into suggest through CLI
2020-01-10 09:13:36 -02:00
Adriano Ferreira
5ea6fd0bcb
Implemented way to use preferred-install for defining granular preferences through CLI
...
Currently, preferred-install accepts the hash of patterns as the value in the composer.json. I've followed the same approach as used in extra and platform for letting the user define install preferences through CLI in the format: `composer config preferred-install my-organization/stable-package.dist`.
2020-01-07 14:25:57 -02:00
Chad Wade Day, Jr
917680e0d4
Make global exec execute commands in working directory
2020-01-06 19:29:00 -08:00
Stephan Vock
731d94a2a3
VcsRepositories: mark archived repositories as abandoned
2020-01-04 17:01:27 +00:00
Tyson Andre
6827105a5b
Fix nits on typos
2019-12-29 12:14:38 -05:00
Jordi Boggiano
2dd001132a
Merge pull request #8492 from staabm/putenv
...
implemented `@putenv` composer script
2019-12-22 12:27:23 +01:00
Markus Staab
3d8c1ebad5
implemented @putenv composer script
...
@putenv supports setting environment variables in a x-OS compatible way
2019-12-21 19:26:29 +01:00
johnstevenson
beacdf4e51
Add Windows OneDrive to platform warnings
2019-12-20 19:01:57 +00:00
Stephan Vock
dd2cc3e985
VcsRepository: make transport exceptions during initialize run accessible
...
* also display the http status code in composer failed to load a composer.json file
2019-12-17 10:26:21 +00:00
Jordi Boggiano
082422f334
Merge pull request #8458 from johnstevenson/noproxy
...
Rewrite NoProxyPattern to include IPv6
2019-12-13 12:11:50 +01:00
Jordi Boggiano
92cc5a821f
Merge pull request #8412 from polarathene/fix/improve-createproject-ux
...
Fix: Improve the create-project UX
2019-12-07 20:36:04 +01:00
Jordi Boggiano
295cc8bc90
Merge pull request #8462 from BR0kEN-/issues/8461
...
#8461 : [ZipDownloader] Print `unzip` exit code when the command is failed
2019-12-07 18:42:26 +01:00
Sergii Bondarenko
bb127aa3e7
Resolves #8461 : [ZipDownloader] Print `unzip` exit code when the command is failed
2019-12-03 15:30:08 +04:00
gary houbre
920d690d90
Added new Alias For Clear cache
2019-12-02 18:54:54 +01:00
johnstevenson
74ba9decdf
Rewrite NoProxyPattern to include IPv6
...
This includes two breaking changes:
- the hostname is not resolved in the case of an IP address.
- a hostname with a trailing period (FQDN) is not matched.
This brings the basic implementation in line with curl behaviour, with
the addition of full IP address and range matching (curl does not
differentiate between IP addresses host names).
The NO_PROXY environment variable can be set to either a comma-separated
list of host names that should not use a proxy, or single asterisk `*`
to match all hosts.
- Port numbers can be included by prefixing the port with a colon `:`.
- IP addresses can be used, but must be enclosed in square brackets
`[...]` if they include a port number.
- IP address ranges can specified in CIDR notation, separating the IP
address and prefix-length with a forward slash `/`.
2019-11-29 20:39:08 +00:00
Jordi Boggiano
67e170eaa8
Merge branch '1.9'
2019-11-23 12:25:23 +01:00
Jordi Boggiano
89f6b2c54c
Merge pull request #8418 from glaubinix/f/github-authentication-behaviour
...
Git: fix authentication handling for private GitHub repositories
2019-11-23 12:24:41 +01:00
Cyril VERLOOP
0bd3f27693
Do not show commit signature for git log.
2019-11-23 12:23:46 +01:00
Jordi Boggiano
44cdc37c0c
Invalidate map cache when addPackage/removePackage is called
2019-11-23 12:07:29 +01:00
Stephan Vock
b847115617
Git: fix authentication handling for private GitHub repositories
2019-11-23 12:02:06 +01:00
Michael Thessel
96af983700
Fixed map initialization
2019-11-21 10:08:09 -08:00
Michael Thessel
f8010d5220
Improved hasPackage() performance
2019-11-20 14:58:28 -08:00
xy2z
a91c946e27
Hide not-yet installed packages from "require" and "init" suggestions
2019-11-12 16:32:04 +01:00
johnstevenson
7e649fac41
Fix Windows test regression from commit 149250a
...
Commit: 149250ab92
ProcessExecutor::escape handled a false value inconsistently across
platforms, returning an emtpy string on Windows, otherwise `''`. This
is fixed to return `""` on Windows.
The GitDownloaderTest code has been appropriately updated.
2019-11-07 12:50:42 +00:00
polarathene
43e0321ee7
Chore: Use consistent directory path
...
Only when a install directory was not specified, was the CWD prepended to `$directory`. This change provides consistency in paths displayed to the user.
2019-11-05 21:14:22 +13:00
polarathene
1b2582ff5b
Chore: Improve create-project install UX
...
Provides feedback output before a potentially long wait on getBestCandidate() call on slow network connections where unresponsiveness/hang may be assumed.
2019-11-05 20:33:20 +13:00
polarathene
5987114f6c
Fix: Fail when install location is a file
...
In the event a file has the same name as the intended install directory, fail fast too.
2019-11-05 20:29:57 +13:00
polarathene
11207a9a2e
Fix: Check for null install directory earlier
...
Allows for failing fast when no install directory was provided to the command(uses package name instead).
2019-11-05 20:26:30 +13:00
polarathene
e5e8736383
Fix: Fail fast when the project directory is not empty
...
Avoid waiting until after `getBestCandidate()` has finished, as it can add notably delay on slow connections due to downloading megabytes of data. Only to fail if the install location is invalid.
2019-11-05 20:26:21 +13:00
Andreas Möller
f7f7883a5e
Fix: Xdebug vs xdebug
2019-11-03 14:08:14 +01:00
Jordi Boggiano
3496431a6c
Fix PSR warnings for optimized autoloader, refs #8397 , refs #8403
2019-11-01 17:13:02 +01:00
Jordi Boggiano
6a7f8ac335
Merge branch '1.9'
2019-11-01 16:41:16 +01:00
Jordi Boggiano
af86ca1fb3
Output a hint that maybe you are not in the right directory, fixes #8404
2019-11-01 16:32:34 +01:00
Jordi Boggiano
d059d90ecf
Fix PSR warnings for optimized autoloader, refs #8397 , refs #8403
2019-11-01 16:18:42 +01:00
Jordi Boggiano
502b68967a
Fix tests for PSR-fix in optimized autoloader, refs #8397
2019-11-01 15:31:55 +01:00
Jordi Boggiano
f6b8643dcd
Change PSR-fix for optimized autoloader to only warn for now, refs #8397
2019-11-01 14:50:15 +01:00
Jordi Boggiano
050707ed0c
Fix output of dump-autoload command to avoid interfering with warnings, refs #8397
2019-10-30 16:35:13 +01:00
Jordi Boggiano
3a0d05c148
Merge remote-tracking branch 'and800/fix-autoload-opts'
2019-10-30 16:22:44 +01:00
Jordi Boggiano
a0690525b5
Merge branch '1.9'
2019-10-30 15:25:57 +01:00
Jordi Boggiano
149250ab92
Remove credentials from git remotes in cache and vendor dirs
...
This only removes the credentials if they are managed by composer auth.json or equivalent, if the credentials were present in the package URL to begin with they might remain
Refs #8293
Fixes #3644
Closes #3608
2019-10-30 15:24:53 +01:00
Jordi Boggiano
4e43f849c7
Avoid overwriting credentials with existing ones from git repos, refs #8293
2019-10-30 12:56:08 +01:00
Jordi Boggiano
12184aa9c5
Fix github auth to try https with pwd also, fixes #8356
2019-10-30 12:01:23 +01:00
Jordi Boggiano
b925d06861
Fix gitlab support for basic-auth fallback from ssh URLs
2019-10-30 11:25:00 +01:00
Jordi Boggiano
ae9cc3db58
Avoid clearing the error output during removeDirectory execution, losing git error output, fixes #8351
2019-10-30 10:45:40 +01:00
Andriy Maletsky
ec293adabc
make optimized autoloader respect PSR standards
2019-10-29 20:36:29 +02:00
Armando Miani
82d939d7f7
Validate composer show with --tree and --path options set ( #8390 )
2019-10-29 15:06:07 +01:00
Jordi Boggiano
8bcacc8a3a
Merge branch '1.9'
2019-10-29 14:24:44 +01:00
MichaelKo
99e23d5263
Don't show root warning for docker containers
...
Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com>
2019-10-29 14:24:33 +01:00
Markus Staab
e47aa38ad4
Added phpdoc for ComposerAutoloaderInit$SHA1::getLoader() ( #8393 )
2019-10-29 14:08:33 +01:00
Jordi Boggiano
eea4098f98
Merge branch '1.9'
2019-10-25 14:17:35 +02:00
Jordi Boggiano
4fc6479837
Fix require command to allow working on network mounts, fixes #8231
2019-10-25 14:08:30 +02:00
Jordi Boggiano
46657a8a7f
5.3 support :/
2019-10-24 15:26:55 +02:00
Jordi Boggiano
8d92048c8c
Update safeguard code, fixes #8383
2019-10-24 15:20:14 +02:00
xy2z
1a0d5dfacd
Now using findPackage() instead of HasPackageName()
2019-10-24 15:13:17 +02:00
Jordi Boggiano
78b8c365cd
Merge branch '1.9'
2019-10-24 15:05:45 +02:00
Jordi Boggiano
18dad48fa6
Merge pull request #8363 from sincilite/feature/error-reporting-for-missing-path
...
Improve error reporting for missing path in Repository Path
2019-10-24 11:34:55 +02:00
Jordi Boggiano
b311b2c077
Merge pull request #8375 from mathiasdonoso/feature/add-homepage-to-package-information-command
...
added package homepage information to the command 'show'
2019-10-24 11:32:59 +02:00
Jordi Boggiano
f2700bbd98
Merge pull request #8377 from TysonAndre/misc-nit
...
Fix misc phpdoc and strpos arg order nits for suggestions
2019-10-24 11:17:03 +02:00
Jordi Boggiano
d73cef3fb4
Avoid calling findPackage for non-platform packages
2019-10-24 11:16:42 +02:00
Jordi Boggiano
e85ade3107
Merge pull request #8386 from cedric-anne/bugfix/fix-php74-outdated-command
...
Fix composer outdated command on PHP 7.4; fixes #8346
2019-10-24 11:13:27 +02:00
Jordi Boggiano
82e0fdccca
Merge pull request #8384 from aboks/no-lock
...
Config option to disable lockfile generation
2019-10-24 11:06:02 +02:00
Jordi Boggiano
127ba941f1
Merge pull request #8376 from aschempp/bugfix/why-replaces
...
Consider replaces when checking package dependents
2019-10-24 10:48:09 +02:00
Jordi Boggiano
9082701ccb
Merge pull request #8359 from glaubinix/t/show-used-authentication-in-debug
...
Debug: display used authentication for http calls
2019-10-24 10:46:03 +02:00
Cédric Anne
9c9ca87537
Fix composer outdated command on PHP 7.4; fixes #8346
2019-10-21 13:04:31 +02:00
Stephan Vock
73b269fade
HgDriver: don't run command in non-existing directory
2019-10-21 11:11:10 +02:00
Mikhail Fesenko
c2f1a6b643
Added clear cache for windows, fix tests
2019-10-21 11:06:12 +02:00
Arnout Boks
7c5e5e3ede
Add option to disable the lock file
...
When the `lock` option is set to false, composer will not write a
`composer.lock` file to disk. This signals that the package is meant
to be developed with unlocked and always updated dependencies. At the
moment, both `install` and `update` are allowed to install the
dependencies for such a package. If #6822 is implemented, only `update`
should be used for packages without a lockfile.
https://github.com/composer/composer/issues/8354
2019-10-19 21:46:29 +02:00
Andreas Schempp
5f202efa0b
Added comment why source link check is necessary
2019-10-16 13:36:28 +02:00
Tyson Andre
4c8e41d9a9
Fix misc phpdoc and strpos arg order nits
...
https://www.php.net/strpos has the signature
`strpos ( string $haystack , mixed $needle [, int $offset = 0 ] ) : int`
(The needle is usually the constant)
`strpos('/', $suggestion)` would only be `false` for `''` and `'/'`
So the existing check would just not suggest **anything** that was
already installed (from pecl, built-in, or composer).
The intent seems to be to not suggest non-vendored php packages
that were already installed. (b20cc22ebb
)
2019-10-15 21:32:02 -04:00
Andreas Schempp
80317eb289
Remove invalid array keys
2019-10-15 10:56:43 +02:00
Andreas Schempp
20eb9e66cf
Consider replaces when checking package dependents
2019-10-15 08:26:19 +02:00
Mathías Donoso
07ec3bda3e
changed homepage information position
2019-10-15 00:38:24 -03:00
Mathías Donoso
14b3f09cf8
added package homepage information to the command 'show'
2019-10-15 00:19:57 -03:00
xy2z
a8abdd9639
Hide installed packages from suggestions when package is not found
2019-10-12 22:22:27 +02:00
Mike van Rooyen
e910e06f63
Add details of the path to aid debugging
2019-10-08 16:02:03 +01:00
Mike van Rooyen
18895064ad
Check that if the getUrlMatches method returns an empty value which means the path is incorrect
2019-10-08 15:46:35 +01:00
Alexander M. Turek
146aa4938f
Command::execute() should always return an integer.
2019-10-07 18:50:18 +02:00
Stephan Vock
0d1d35c346
Debug: display used authentication for http calls
2019-10-07 08:51:53 +01:00
Jordi Boggiano
1843312ddf
Merge pull request #8313 from unkind/feature-require-fixed
...
Provide `--fixed` option for the `require` command, fixes #8303
2019-10-06 21:39:45 +02:00
Jordi Boggiano
5b4fad9056
Update target version for master branch
2019-10-06 21:39:10 +02:00
Jordi Boggiano
9e2485aa4d
Make gitlab/bitbucket driver checks case insensitive
2019-10-06 21:37:16 +02:00
zakonnic
9f6e45051a
Optimize template for striping non-php blocks
2019-09-20 16:59:53 +03:00
zakonnic
ec96e5de64
Fix incorrect strip of non-php blocks in the file
2019-09-20 12:58:09 +03:00
Nikita Konstantinov
e3b6c67a44
Provide `--fixed` option for the `require` command, fixes #8303
2019-09-18 16:05:25 +03:00
James Ho
91732eee55
8330 Correct issue where permission umask of files were not set when archiving in zip format with ZipArchiver
2019-09-17 15:10:32 +01:00
Grey Baker
b09945c3ba
Allow for leading slash in path part of GitHub URLs
2019-09-02 22:26:35 +01:00
Jordi Boggiano
f0d565bb6d
Avoid transforming the origins when prompting for auth, fixes #8300
2019-08-30 17:52:08 +02:00
Jordi Boggiano
d3dc280322
Merge pull request #8296 from rbairwell/fix-php74-accessarray-offset-on-path
...
Fixes a problem with path based repositories on PHP7.4
2019-08-29 15:16:53 +02:00
Jordi Boggiano
7d99a56332
Combine conditionals in one
2019-08-29 15:16:34 +02:00
Jordi Boggiano
089fcde6cf
Merge remote-tracking branch 'davidszkiba/bugfix/issue-8289'
2019-08-29 15:09:14 +02:00
Jordi Boggiano
fd70d9cdc3
Stripe access tokens in a more generic way
2019-08-29 12:22:38 +02:00
rbairwell
550c01b471
Fixes a problem with path based repositories on PHP7.4 where an attempt is made to access null as an array
2019-08-27 20:53:57 +01:00
David Szkiba
0500e64f88
Respect COMPOSER_NO_INTERATION for search prompt.
...
As described in GH-8289, if no `composer.json` file is found in the current
directory, the user is prompted if she wants to use another `composer.json` file
from a parent directory even if the `COMPOSER_NO_INTERACTION` environment
variable is set. This is fixed here by just moving the check of the environment
variable up in the code so that it is evaluated before the user is prompted.
2019-08-25 17:25:44 +02:00
Stephan Vock
f9fccbab1e
GitHub: don't display access token in debug log
2019-08-21 10:07:36 +01:00
Jordi Boggiano
96ad0aa01f
Remove extra arg
2019-08-02 13:45:43 +02:00
Jordi Boggiano
872604ab36
Allow path repos to point to their own source dir as install target, resulting in noop, fixes #8254
2019-08-02 13:25:11 +02:00
Jordi Boggiano
362ebe4f68
Fix update mirrors to also update transport-options, fixes #7672
2019-07-31 18:43:18 +02:00
Jordi Boggiano
db6882b57f
Fix updating or URLs to include dist type and shasum, fixes #8216
2019-07-31 18:36:27 +02:00
Jordi Boggiano
0fe200d6d9
Fix origin computation
2019-07-31 18:01:08 +02:00