-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update to upstream release 0.157.2 #4
Open
martyone
wants to merge
397
commits into
mer-master
Choose a base branch
from
jb36175-3
base: mer-master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Introduced in commit 76023d5.
No changes w.r.t. to semantics.
%Z doesn't make sense for a time returned by gmtime.
The gmtime function is intended to be used for calendar time.
This is using the request collection api call now instead of xpath query. More searches should be adapted similar most likely. "osc my sr" is not a good name for this since it is not limited to submit actions. But "osc my rq" is used for incoming requests.
Updating a whole project against an old API server (experienced with 2.3.5) leads to: Server returned an error: HTTP Error 400: Bad Request unknown parameter 'nofilename' So just retry without nofilename if an 400 is thrown.
Enable container-based Travis CI builds
When lxml fails to parse the _service file show error message instead of backtrace
More meaningful error if ET.parse runs into problems. Fixes #153.
allow force commit
added a simple way to verify osc code base with the python security scanner bandit
Add support for non-root paths in API URLs.
…line, but reached on typical screens anyway the second line if they had more than a few chars.
Currently osc can't access API URLs which share the same IP address with other SSL-enabled sites, complaining about certificate not matching hostname. This change solves this problem by instructing M2Crypto.SSL.Connection to send the desired hostname to https server using TLS SNI extension, thus allowing the server to present the right certificate and choose the right virtual site. This is useful for those who can't afford to have a separate IP address for OBS API. For TLS SNI to work correctly, M2Crypto should be patched: https://bugzilla.osafoundation.org/show_bug.cgi?id=13073 Some distributions (like Fedora) already include this patch. For unpatched M2Crypto osc degrades to operation without TLS SNI. Signed-off-by: Oleg Girko <[email protected]>
Stop using the multibuild and locallink query parameters, if the api does not support them (in get_package_results).
If a package does not exist on the server, the Serviceinfo.getProjectGlobalServices call results in a 404. In this case, we try it again with the _project package (note: this does not take potential "linked" services into account, if the local package is a _link). Fixes: #277 ("404 on running service for non commited package")
Some osc plugins ship with extra modules that are not globally installed as python modules. So expand search path.
Add plugin directories to sys.path, because an osc plugin could rely on additional packages or modules that are shipped with the plugin itself.
this allows us also to drop the nasty fallback code
Deleting a conflict file (state 'C') during an update operation results in an inconsistent working copy. To fix this, we remove the conflict file from the _in_conflict list.
(imported from commit 0c69bf4) Signed-off-by: Martin Kampas <[email protected]>
Convert to tar_git packaging [mer] Converted to tar_git packaging. JB#36175
Signed-off-by: Martin Kampas <[email protected]> (cherry picked from commit 72888fa)
Signed-off-by: Carsten Munk <[email protected]> (cherry picked from commit f4287df)
usage: osc copyprj [OPTIONS] SOURCEPRJ DESTPRJ A way to copy a project and all packages in it It can not yet be done across buildservice instances The user must be able to create DESTPRJ (squashed from commits 7422462 8a67efb 0ea5abd 9e603b5) Signed-off-by: Martin Kampas <[email protected]>
--rebuild sends --skip-prep to build and rpm to skip the %prep phase. This is useful in conjunction with the --rsync* options to enable rapid rebuilds in the clean rpmbuild environment. --chroot-only creates a chroot without doing a build - this can be used to build scratchbox2 targets (cherry picked from commit e38cbb2)
Makes preferring local packages with armv8el and i486 OBS schedulers work. These mappings armv7hl/armv7tnhl -> armv8el and i486 -> i586/i686 only affect the "get-preferred-packages" evaluation that is used when the -p or --prefer-pkgs option is used with the osc build command. Signed-off-by: Juha Kallioinen <[email protected]> (cherry picked from commit 3a3e1c3)
…ngling symlink) Signed-off-by: David Greaves <[email protected]> (cherry picked from commit 773bfa6)
Update to upstream release 0.151.2 [mer] Updated to upstream release 0.151.2. JB#36175
Signed-off-by: Martin Kampas <[email protected]> (cherry picked from commit 6cb757c)
Signed-off-by: Carsten Munk <[email protected]> (cherry picked from commit e90f3e2)
usage: osc copyprj [OPTIONS] SOURCEPRJ DESTPRJ A way to copy a project and all packages in it It can not yet be done across buildservice instances The user must be able to create DESTPRJ Signed-off-by: Martin Kampas <[email protected]> (cherry picked from commit a9c7e05)
--rebuild sends --skip-prep to build and rpm to skip the %prep phase. This is useful in conjunction with the --rsync* options to enable rapid rebuilds in the clean rpmbuild environment. --chroot-only creates a chroot without doing a build - this can be used to build scratchbox2 targets (cherry picked from commit 0de8b47)
Makes preferring local packages with armv8el and i486 OBS schedulers work. These mappings armv7hl/armv7tnhl -> armv8el and i486 -> i586/i686 only affect the "get-preferred-packages" evaluation that is used when the -p or --prefer-pkgs option is used with the osc build command. Signed-off-by: Juha Kallioinen <[email protected]> (cherry picked from commit 04a4478)
…ngling symlink) Signed-off-by: David Greaves <[email protected]> (cherry picked from commit 9578f5b)
martyone
added a commit
that referenced
this pull request
May 18, 2017
Update to upstream release 0.157.2 [mer] Updated to upstream release 0.157.2. JB#36175
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[mer] Updated to upstream release 0.157.2. JB#36175