Egbert Eich
9937cb9ddf
Add support for searches for groups with -i, -b and -m
...
Involved parties can be persons or groups; add support for those.
Signed-off-by: Egbert Eich <eich@suse.de>
2015-04-22 12:40:07 +02:00
Andreas Schwab
b7912a78dd
- do_buildhistory: split args on slash
2015-04-11 08:51:26 +02:00
e610cb569a
Merge pull request #138 from k0da/threads
...
Pass threads option to obs-build
2015-04-08 10:30:14 +02:00
Marcus Huewe
7116509330
- do_build: --noinit and --offline are _not_ mutually exclusive
...
Thanks to darix for the hint!
2015-03-10 15:49:35 +01:00
Dinar Valeev
e12f1b43c4
Pass threads option to obs-build
...
Currently --jobs sets only -smp flag for VM, in some cases we want
to pass threads as well. So the command line would like -smp 4,threads=4
Signed-off-by: Dinar Valeev <dvaleev@suse.com>
2015-03-10 11:58:08 +01:00
ecd76148b8
- add support for updating the link in target package in submit action
...
This is also changing the request format to post OBS 1.0, but
that was also the case before when a source update option was used.
2015-03-09 08:45:07 +01:00
Bernhard M. Wiedemann
00c7b9dbfc
fix typo in help message (bnc#918906)
...
https://bugzilla.opensuse.org/show_bug.cgi?id=918906
2015-02-21 08:49:56 +01:00
Marcus Huewe
8f5bf385be
- do_status: mention 'S' state in the help text
2015-01-21 03:01:29 +01:00
9cddc53afc
- add mr --release-project option for kgraft updates
2014-12-12 13:44:24 +01:00
Marcus Huewe
42d3e815c1
- do_status: mark a frozen package with an "F"
2014-11-21 16:12:26 +01:00
Marcus Huewe
930dfc1999
- parse_repoarchdescr: added openSUSE_Tumbleweed to the repository list
2014-11-17 10:12:35 +01:00
Marcus Huewe
ad92e8abb7
- fixed #122 ("osc chroot fails to use the osc build buildroot directory")
...
Renamed osc chroot's "--root" option to "--login-as-root" (kept the short
option "-r"). Added new "--root /path/to/buildroot" option (this is consistent
with "osc build --root...").
2014-11-14 15:54:55 +01:00
de702bb8ed
- follow the request order of the api (sorting according to priorization)
2014-11-11 08:26:17 +01:00
6a4423ff62
- better example for osc api -e
2014-10-31 14:14:06 +01:00
bb75ce34fd
- add "osc api --edit" option
2014-10-31 09:22:25 +01:00
Marcus Huewe
3e57d58729
- do_meta: fixed description (partly fixes #120 )
2014-10-27 01:31:47 +01:00
Marcus Huewe
27bdf6cbdd
- do_addremove: if a "deleted" file exists in the wc, track it again
2014-10-21 22:31:30 +02:00
Marcus Huewe
26ffaa9de8
- do_addremove: fixed "corner case"
...
Assume $PWD/x is a directory and /path/to/pkg/x is an unversioned file.
Without this fix, "osc ar /path/to/pkg" did not add the file "x".
2014-10-21 22:23:28 +02:00
Marcus Huewe
e8f0e78672
- do_addremove: use local variable instead of an attribute (cosmetic)
2014-10-21 22:15:54 +02:00
Marcus Huewe
a7c92eb18f
- do not hardcode path to the build scripts and removed legacy check
2014-10-01 14:45:48 +02:00
Adam Spiers
e1cdf86bdf
fix osc service exit code
...
Commands like "osc service disabledrun" would always return exitcode 0
even when the source service failed. This broke any scripts which
wrapped around osc service.
2014-09-30 12:51:13 +01:00
Marcus Huewe
603cf3b713
- fixed #113 ("osc creq -s ...")
2014-09-23 13:05:10 +02:00
Marcus Huewe
45bf1945d0
- do_createrequest: remove --diff option
...
This never worked and makes no sense (IMHO): use "osc request" for things
like that.
2014-09-23 12:45:44 +02:00
bd82e236ee
- display request priorities, if important or critical
...
- add "osc rq priorize" command to re-priorize existing requests
- allow also "osc rq ls" shortcut
2014-09-11 11:25:24 +02:00
3b6f7f1269
- make it possible to list by given review states
...
it used the state always for request and review state before, which makes no sense.
makes the code a bit nicer as well hopefully as well
2014-08-25 17:02:56 +02:00
3adb160e0f
support groups in maintainership requests
2014-08-19 14:34:18 +02:00
Marcus Huewe
b07a4d0b37
Merge branch 'w291' of https://github.com/berendt/osc
...
Conflicts:
osc/build.py
Resolved merge conflict.
2014-08-14 17:24:28 +02:00
Christian Berendt
1751bdc47f
Resolve PEP8 issue E231
...
* E231 missing whitespace after ':'
2014-08-13 17:30:12 +02:00
Christian Berendt
d35983d5b8
Resolve PEP8 issue W291
...
* W291 trailing whitespace
2014-08-12 15:01:16 +02:00
Ludwig Nussel
1b6e2ac745
support the ls expand option also for projects
...
packages of linked projects can be listed using the expand option
2014-08-11 17:06:18 +02:00
Marcus Huewe
902adde28b
- do_localbuildlog: support %(apihost)s in build-root config setting
2014-08-04 11:15:34 +02:00
Marcus Huewe
e9233a5eab
- parse_repoarchdescr: remove duplicates from repo_names
2014-07-21 14:32:54 +02:00
Marcus Huewe
e90a60a8c8
Merge branch 'livebuild' of https://github.com/jblunck/osc
2014-07-16 10:51:06 +02:00
Marcus Huewe
ea349d9ad0
- do_buildinfo: fixed "osc buildinfo -p <path>"
2014-07-15 20:38:19 +02:00
f8a1fa2ebc
- give a better hint to the user, when a search role is not defined
2014-07-10 09:50:52 +02:00
Jan Blunck
475d2a298d
Add support for livebuild buildtype
...
This commit allows for 'osc build' to do local builds of type livebuild.
Debian livebuild is the native Debian live image building system.
Signed-off-by: Jan Blunck <jblunck@infradead.org>
2014-07-08 21:18:01 +02:00
Marcus Huewe
d86e28744f
- parse_repoarchdescr: allow an unsupported arch during the guessing phase
...
This makes the error message in some cases more precise (for instance
"osc build openSUSE_13.21 x86_641")
2014-07-02 23:56:34 +02:00
Marcus Huewe
e662fd815b
- parse_repoarchdescr: improved yet another error message
2014-07-02 23:13:42 +02:00
Marcus Huewe
a8d0b948af
- parse_repoarchdescr: improved error messages a bit
...
Moved reading/writing of .osc/_build_repositories into the Repo class.
2014-07-02 22:07:01 +02:00
Marcus Huewe
a754164067
- use HTTPError.hdrs instead of HTTPError.headers
...
There are situations where a HTTPError instance has no headers
attribute.
2014-06-08 21:33:06 +02:00
Marcus Huewe
444a503bca
- fixed #89 ("osc commit fails with do_package_tracking = 0")
2014-06-04 16:17:06 +02:00
Marcus Huewe
a833120ebd
do_updatepacmetafromspec: added "updatepkgmetafromspec" alias
2014-05-22 13:01:44 +02:00
7f21679413
- do not forward requests if accept fails (issue 91)
2014-05-21 15:45:07 +02:00
Marcus Huewe
c873252d70
- do_build: do not suppress --download-api-only option
...
Or was there a particular reason for not displaying this option in
"osc build -h"?
2014-05-15 17:48:11 +02:00
3e7f355a0a
- show errors when request change failed
2014-05-15 18:09:47 +02:00
Marcus Huewe
38fbe8fb11
- do_maintainer: introduced setBugownerHelper method
...
Do not swallow urllib2.HTTPError exceptions with code != 403
2014-05-08 16:07:42 +02:00
Marcus Huewe
87fc39fee4
- do_maintainer: do not set bugowner/create bugowner request action twice
2014-05-08 15:41:15 +02:00
Marcus Huewe
47af622031
- do_maintainer: fixed typo (that cause a TypeError)
2014-05-08 15:26:29 +02:00
Marcus Huewe
474dcf6843
- handle ImportError of a plugin more gracefully
...
See bnc#876538 for the details.
2014-05-06 18:51:12 +02:00
Marcus Huewe
5e22cd3f4f
- do_submitrequest: use continue to start next loop iteration (instead of "next"...)
2014-04-28 15:09:29 +02:00
Marcus Huewe
d243241b1c
- added support for "osc requestmaintainership PROJECT" (if cwd is no package wc)
2014-03-12 16:41:46 +01:00
Marcus Huewe
c66a75018e
- do_submitrequest: consider the "--yes" option if the wc has local modifications
2014-03-12 10:50:46 +01:00
714de8519c
- support release --set-release option
2014-03-05 16:03:23 +01:00
46b8f2613f
- fix --no-checks description
2014-03-04 09:12:26 +01:00
Marcus Huewe
8b058b3a47
- do_setlinkrev, set_link_rev: fixed #72
...
Also refactored set_link_rev code a bit so that the new _set_link_rev
function could be used by link_pac in the future.
2014-03-03 22:44:30 +01:00
Scott Bahling
a33c40eb53
Fix handling of meta command within local working directory
...
* Fix osc ignoring -A apiurl command option when arguments are
less than 2 and executed within local working copy
* Enhance handling of meta command within local working copy.
- meta prj: Try to use project and apiurl of local working copy
if no arguments are passed
- meta pkg: Try to use project and apiurl of local working copy
if one argument is passed (single argument assumed to be package
name), and try to use project, package and apiurl if no
arguments are passed
2014-02-27 16:45:44 +01:00
c4f0397b0f
Takes care when the commit is in project level
2014-02-27 16:45:44 +01:00
014551e786
Move the user interaction for linked package into commandline.py
2014-02-27 16:45:44 +01:00
Ludwig Nussel
955c46495b
replace sys.exit(0) to avoid backtrace
2014-02-27 08:39:54 +01:00
Marcus Huewe
87e24c3aa6
- do_commit: added --no-message option
...
Commit without specifying a log comment. Fixes #73 .
2014-02-12 14:52:39 +01:00
Sascha Peilicke
3c0dbaba7f
Add flag '--noverify' next to '--no-verify'
...
Align with other '--no$bla' flags. Note that the alternative is added
after '--no-verify', optparse uses the first arg for the stored config
variable.
2014-02-12 12:26:59 +01:00
Marcus Huewe
b5d47ebd8c
- do_maintainer: fixed support for groups
...
Ideally, the whole method will be refactored one day...
2014-02-11 11:56:44 +01:00
Marcus Huewe
49ed086d0b
- do_vc: added a --file <filename> option
...
Can be used to read changes from <filename>.
2014-02-05 17:50:31 +01:00
98a625e89e
- show also error details on request accept error
2014-02-04 14:35:30 +01:00
e1007e1bd8
- show api error on failure of request/review accept
2014-01-30 11:52:24 +01:00
0557fecd02
- support bugowner set of groups
2014-01-24 17:01:35 +01:00
7fcb1bbe3e
- fix set bugowner command
2014-01-24 10:29:00 +01:00
Marcus Huewe
cf35fb441f
- do_request: support float values for --days (affects list)
2014-01-14 11:04:04 +01:00
Marcus Huewe
edd199af3b
- _load_plugins: handle NameError more gracefully
2014-01-10 15:58:33 +01:00
Vitezslav Cizek
f85c76bd42
correctly specify --delete option when using rsync
2014-01-08 15:18:02 +01:00
Michal Čihař
e9793df634
Fixed typo in authentication
2013-12-09 19:26:15 +01:00
f202fbd111
add option for deleterequests using auto-accept
2013-12-05 10:23:53 +01:00
Sascha Peilicke
89eb129e4d
Same output as "osc branch" for mbranch command
...
Users can just copy-paste the "osc co ..." command in their shell and be
more productive.
2013-11-18 13:48:09 +01:00
Marcus Huewe
73048d1159
- yet another fix for the previous commit
2013-11-15 11:42:58 +01:00
Marcus Huewe
b2493a25ae
- fix for 6a36b5180a
...
It is ridiculous that we have duplicated code for "osc sr" and
"osc createrequest"...
2013-11-15 11:39:21 +01:00
Marcus Huewe
6a36b5180a
- do_submitrequest: automatically supersede existing requests if "--yes" was specified
...
Fixes #58
2013-11-15 11:13:27 +01:00
a7ea5043ae
- allow also to execute a token with a registered service
2013-11-13 18:23:44 +01:00
63e1124c09
- add support to handle authentification token support
2013-10-31 09:12:17 +01:00
67802e6a41
- support restartbuild and abortbuild
...
small refactoring but keep api compability
2013-10-28 18:30:32 +01:00
Sascha Peilicke
43499172af
Kill Danny's awesome english
2013-10-28 10:21:21 +01:00
Sascha Peilicke
569e89fede
Add --unset parameter to setdevelproject
...
Allows to unset the devel project (much like setlinkrev -u).
2013-10-18 11:50:07 +02:00
Sascha Peilicke
3d72e60321
Improve devel project commands.
...
Let "osc develproject" (with new alias "dp") display the devel package
if it doesn't match the package name. Deprecate "--raw" option which
only was a crude workaround for that anyway.
Add "osc setdevelproject" (alias "sdp") command to change a package's
devel project / package.
2013-10-07 14:31:50 +02:00
Marcus Huewe
7f1d7f6258
- do_request: added --no-devel option in order to disable the forwarding to the devel project (if the request is accepted)
...
Original patch by "Dominique Leuenberger a.k.a. Dimstar" <dimstar@opensuse.org>
(I just renamed the option from "--nodevel" to "--no-devel").
2013-09-25 15:36:54 +02:00
38edcb605f
- drop double read(), the copy_pac method is doing that already and python 2.6 is crashing here
2013-09-17 16:39:23 +02:00
Marcus Huewe
bf2e372c30
- added new "osc clean" command
...
"osc clean" removes all untracked files from a package working
copy.
2013-09-12 16:14:14 +02:00
aef9f7e6d2
- _sslcert is stored in meta space
2013-09-05 14:54:15 +02:00
edda98eaff
- add signkey --sslcert option to fetch the optional create ssl certificate instead of gpg key
2013-08-30 09:41:13 +02:00
Marcus Huewe
c78da6c496
- _load_plugins: also add imported modules to the class
...
This is needed for backward compatibility. New plugins
(which do not care about "old" osc versions) should not
use "self.<imported modname>.<something>" anymore
to refer to the imported module. Instead use
"<imported modname>.<something>" (this will only work with
osc > 0.140.1).
2013-08-15 17:26:07 +02:00
6461c9faf0
add --last parameter for build logs to show last finished log file, if currently building
2013-08-13 10:38:43 +02:00
Marcus Huewe
67a0671c8a
- _load_plugins: follow-up fix for commit 58d716a6f7
...
Only add functions to the Osc class which are defined in the _current_
module.
2013-07-23 12:10:31 +02:00
41adda44f6
- add support for manual release of sources with binaries (FATE #315250 )
2013-07-08 15:59:14 +02:00
Marcus Huewe
58d716a6f7
- _load_plugins: add all functions from the plugin to the Osc class
...
Adding only functions which starts with "do_" breaks the old
behavior.
2013-06-26 10:18:14 +02:00
Marcus Huewe
4996b1d1ac
- do_copypac: fixed help text of the --revision option (as suggested by darix)
...
It "copies" the specified revision instead of "linking" it.
2013-06-21 15:11:20 +02:00
Marcus Huewe
58532bbac7
- small fix for commit d338254bb7
...
catch HTTPError instead of TypeError
2013-06-17 17:37:40 +02:00
Sascha Peilicke
d338254bb7
Display meaningful message for queries w/o project
...
Like: osc rq list -U $USER -t change_devel
2013-06-17 16:26:00 +02:00
Sascha Peilicke
4007800880
Catch specific exception. Catch-all is calling for error
2013-06-17 16:21:32 +02:00
Marcus Huewe
b6c9505274
- reworked the plugin loading mechanism
...
Using the "old" exec approach isn't possible anymore because it'll break all
plugins which aren't compatible with python3 (for instance the usage of
python2's "print" statement will lead to an error). In order to circumvent
this problem we do the following:
- import the plugin/module
- update the module's global symbol table with the "globals()" of the
commandline module
- bind the module's "do_*" functions to the "Osc" class
This basically mimics the old "exec" semantics.
2013-06-13 20:10:12 +02:00
Juergen Weigert
4b48cc611f
fixed plugin crash message: include the plugin name
...
Two occurences.
2013-06-06 12:36:48 +02:00
Juergen Weigert
c7a15b9dab
fixed plugin crash message: include the plugin name
2013-06-06 11:55:50 +02:00
Danny Al-Gaaf
ca306fbb29
commandline.py: remove some unnecessary pass statements
...
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-27 13:42:28 +02:00
Danny Al-Gaaf
42b8d5ff45
commandline.py: fix "More than one statement on a single line"
...
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-27 13:38:49 +02:00
Danny Al-Gaaf
c261a80d46
commandline.py: remove comma, causing trouble
...
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-27 13:06:01 +02:00
Danny Al-Gaaf
00e3932e43
commandline.py: wrap some really long lines
...
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-27 13:03:46 +02:00
Danny Al-Gaaf
8403c92059
commandline.py: add missing spaces
...
Add missing spaces around operators, add missing spaces after comma.
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-27 12:41:50 +02:00
Danny Al-Gaaf
439e03501d
commandline.py: remove unnecessary semicolon
...
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-27 12:18:43 +02:00
Danny Al-Gaaf
e1b8022ca0
commandline.py: fix bad indentation
...
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-27 12:16:44 +02:00
eea716f11f
- support listing of deleted source files "ls -D $PROJECT $PACKAGE"
2013-05-17 10:37:51 +02:00
Michal Čihař
f2a1bde695
Fix typo in help
2013-05-07 09:29:59 +02:00
954c2fc2b2
- fix request ... --or-revoke command for automated request accept/revoking
2013-05-06 18:45:51 +02:00
Marcus Huewe
69150040c2
- do_submitrequest: --diff is not supported in a project working copy
...
This (partly) fixes issue #29 .
2013-05-02 22:18:14 +02:00
90d51da3d2
- add --message option for creating set_bugowner requests
2013-05-02 11:38:53 +02:00
71c40acc51
- fix using --set-bugowner-request on explicit specified containers
2013-05-02 11:08:27 +02:00
69e6e586c7
- fix print syntax
2013-05-02 11:05:48 +02:00
ce998fbc29
- fix spelling typo
2013-05-02 10:57:15 +02:00
a8f14bed60
- allow to set bugowner/maintainership for a given binary
2013-05-02 10:50:05 +02:00
Marcus Huewe
cdc1245960
- pass a str to exec() instead of an open file object
...
An open file object isn't supported anymore by python3.
This fixes issue #26 .
2013-04-30 17:44:38 +02:00
9595aa9f09
- show also groups in maintainer/bugowner search
2013-04-22 17:09:33 +02:00
2b06180efa
- anotehr python3 syntax fix
2013-04-16 15:57:30 +02:00
e1291fdcc6
- fix the general architecture detection for incomplete "osc build" lines
2013-04-16 15:42:37 +02:00
b99233e3ae
- hostarch is an array :/
2013-04-16 15:24:28 +02:00
ce04f8b9bb
- fix syntax to satisfy testsuite
2013-04-16 11:01:56 +02:00
Michal Vyskocil
b787ca2b39
python3 compatibility: make all unit test pass
...
There are many places can't be covered by 2to3, especially the
str/unicode -> str/bytes change done in python3. This is a big patch
incorporating all changes made in order to make python3 suite.py run
without any single failure.
It
* adapt the introspect_handler_3 for case there are no __defaults__
* adds the ET_ENCODING variable for ET.fromstring ("unicode" in py3,
"utf-8" in py2)
* (re)adds various builtins to both python versions
- memoryview to python 2.6
- bytes compatible with py3 to 2.6 and 2.7
and it changes few parts of tests/common.py in order to be compatible
with python3
* new urlcompare method compares all components or url + parsed query
string in a dictionary, so the ordering, neither quoting does not matter
* bytes builtin has been added to 2.x and used in assertEqualMultiline
2013-04-16 10:51:42 +02:00
Michal Vyskocil
f0186dbde8
python3 compatibility: fix all tests
2013-04-16 10:51:42 +02:00
Michal Vyskocil
419367fca3
python3 compatibility: urllib
...
fixes all renames in urllib, urllib2, urlparse modules in python3
2013-04-16 10:51:42 +02:00
Michal Vyskocil
7f2031558c
python3 compatibility: print function
...
The most visible change in python3 - removal of print statement and all
the crufty
print >> sys.stderr, foo,
The from __future__ import print_function makes it available in python
2.6
2013-04-16 10:51:41 +02:00
Michal Vyskocil
0dcbddbafe
python3 compatibility: new syntax for literals
...
The octal literals got a new syntax 0755 -> 0o755
2013-04-16 10:51:18 +02:00
Michal Vyskocil
87d354e1a0
python3 compatibility: import proper modules
...
Some modules (httplib, StringIO, ...) were renamed in python3. This
patch try to import the proper symbols from python3 and then fallback to
python2 in a case ImportError will appear.
There is one exception, python 2.7 got the io module with StringIO, but
it allow unicode arguments only. Therefor the old module is poked before
new one.
2013-04-16 10:51:18 +02:00
Michal Vyskocil
c612e8d47e
python3 compatibility: use relative imports
...
Use relative imports when using module's own modules - this makes a
clear distinction between already developed copy and installed package.
2013-04-16 10:51:18 +02:00
Michal Vyskocil
2ad4a8c873
python3 compatibility: has_key
...
don't use method removed from python3
2013-04-16 10:51:17 +02:00
Michal Vyskocil
19f689ce0b
python3 compatibility: getcwdu
...
used just on one place, seems to be enough to simply remove it
2013-04-16 10:51:17 +02:00
Michal Vyskocil
600a565428
python 3 compatibility: exec
...
exec is no longer a statement
2013-04-16 10:51:17 +02:00
Michal Vyskocil
3a93ac6d10
python3 compatibility: except
...
changes 'except FooError, fe' to 'except FooError as fe'
available in python 2.6
2013-04-16 10:51:17 +02:00
Michal Vyskocil
d3648be24b
python3 compatibility: dict
...
this patch
1.) removes the iteritems/itervalues, which were dropped in py3
items/values are used instead
2.) add an extra list() in a cases the list-based access is needed
(included appending, indexing and so)
3.) changes a sorting idiom in few places
instead of
foo = dict.keys()
foo.sort()
for i in foo:
there is a recommended
for i in sorted(dict.keys()):
4.) in one occassion it removes a if dict.has_key() by simpler
dict.get(key, default)
2013-04-16 10:51:17 +02:00
b8faeeddb4
- fix build on ppc/s390/ia64 (bnc#815296)
2013-04-16 09:04:34 +02:00
Marcus Huewe
9e6e76c712
- do_localbuild: made "arch" argument optional
2013-03-25 20:28:27 +01:00
Marcus Huewe
03b8cba2af
- fixed bnc#807621
...
Bug summary: "osc: when forwarding a request, previous request is
not superseded automatically"
2013-03-08 19:06:04 +01:00
Marcus Huewe
93df866787
- added new function core.run_external which can be used to execute an external program
...
Basically it's just a wrapper around subprocess.call which raises an ExtRuntimeError
exception if subprocess.call raised an OSError with errno set to ENOENT (unfortunately
the OSError's filename attribute is set to None therefore we cannot print a meaningful
error message (that's why an ExtRuntimeError is raised)).
Replaced all occurrences of subprocess.call with a corresponding run_external call.
2013-03-08 00:56:57 +01:00
6d7de62755
- explain the "osc maintainer" command a bit more extensive
2013-03-06 11:49:54 +01:00
Marcus Huewe
b228fc3c98
- do_service: fixed typo in command description
...
Thanks to Richard Bos <rbos@opensuse.org> for spotting this.
2013-03-02 15:27:20 +01:00
6e42a61076
- add a accept-or-revoke function for requests. useful for mass automatisation of processing stuck requests.
2013-02-28 10:32:29 +01:00
Marcus Huewe
45e49905ce
- do_mv: minor cosmetic changes
2013-02-28 00:30:05 +01:00
Bogdano Arendartchuk
1d3805f30e
Allow using directories as mv targets
...
Otherwise osc would crash because the target directory would be in use (in
case of ".".)
2013-02-27 18:40:59 -03:00
e5189178a1
- create multiple-submit requests with revision numbers
2013-02-25 15:22:00 +01:00
3e88c3ce32
- fallback to set_bugowner request when writing to specified container is not permitted
2013-02-21 12:10:02 +01:00
14f6986331
- use server side default when searching the container for setting a bugowner.
2013-02-21 07:26:59 +01:00
220ec0e2cf
"maintainer --user" support to search for all official maintained instance for given user or group
2013-02-20 11:41:29 +01:00
Marcus Huewe
f0d1acf8d4
- removed debug output
2013-02-14 15:39:57 +01:00
Marcus Huewe
920028524b
- fixed UnboundLocalError when creating a submitrequest from a project wc
...
The error occured if no target project was specified by the user.
2013-02-14 15:36:04 +01:00
55ee5763b0
- abort on "search --maintained". Do not redirect to the new command automatically, since it has a different logic
2013-02-14 11:32:27 +01:00
Michal Vyskocil
a69d10616a
osc build on remote --host
...
The new argument for osc build --host will perform the build on a remote
host. It is a shortcut for
rsync -az -e ssh `pwd` user@hostname:/remote/dir
rsync -az -e ssh prefer-dir \
user@hotname:/remote/dir/__prefer-rpms__/prefer-dir
ssh -t user@hostname "cd /remote/dir/package; osc build *build-args"
rsync -az -e ssh user@hostname:/remote/dir/__keep-pkgs__ keep-pkgs
iow it copy the current directory to the /remote/directory on hostname
(if not specified, the ~/ is supplied) and then run the osc build on
hostname. All global and local arguments are supplied to the remote osc
build, but arguments points to local path (--host, --keep-pkgs, --prefer-pkgs,
--rsync-dest, --rsync-src and --overlay) are modified to match to remote
host.
It support the OSC_ variables, so running with
OSC_BUILD_ROOT=/somewhere osc build --host ... will push the variable to
the remove osc process
2013-02-12 15:08:20 +01:00
d26b3df32f
- handle architecture parsing also right when an emulator is used. Just warn in that case,
...
because we can check for sure if an emulator is configured.
2013-02-11 15:35:15 +01:00
Marcus Huewe
7d46c5f879
- do_chroot: fixed suargs handling (patch by Olaf Hering <olaf@aepfle.de>)
2013-02-07 15:50:53 +01:00
143af44479
- support --target argument for "osc build"
2013-02-06 17:12:52 +01:00
Andreas Schwab
b07891879b
_submit_request: add missing newline before diff
2013-02-05 11:13:07 +01:00
8097a9550d
- fix local build with emulator support.
...
- fix package signing check (skip always for use inside of secure VMs)
2013-02-03 19:08:38 +01:00
Andreas Schwab
8f38f33228
do_submitrequest: missing newline before diff in message
2013-02-01 12:21:52 +01:00
Andreas Schwab
7ef8bee0b8
osc diff: use pager also for local diff
2013-02-01 12:21:33 +01:00
Markus Lehtonen
68670a7a83
Fix %(apihost)s in "build-root" option for osc chroot
...
Prevents a crash in osc chroot when %(apihost)s is defined in the
"build-root" config option.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2013-02-01 12:18:29 +01:00
4e0fb4cbeb
submitrequest: old not anymore used maintenance code got removed. It is possible now
...
to create one request to submit all changed packages of an project in
one request. Just run "osc sr" in the checked out project directory.
2013-01-31 16:03:16 +01:00
Adam Spiers
57c8cffe66
- add prdiff subcommand and test suite
2013-01-18 22:38:21 +00:00
Marcus Huewe
afa1911798
do_prjresults: support --xml option
...
"prjresults --xml..." simply prints the raw xml which it receives
from the api.
2013-01-18 16:56:13 +01:00
Marcus Huewe
cfed92103a
- do_maintainer: support "osc maintainer prj/pkg" syntax
2013-01-08 22:32:27 +01:00
Marcus Huewe
737bac561b
- added support to strip the build time from the buildlog when running "bl", "rbl", "lbl"
...
Also added a config option "buildlog_strip_time" to permanently enable/disable the
stripping of the build time.
2012-12-15 01:50:24 +01:00
bfa108810a
add support to remove repositories recursively (mostly only usefull for admins)
2012-12-06 14:07:02 +01:00
613e2b5176
- buildinfo --debug option for verbose output of dependency calculation
2012-12-04 16:44:14 +01:00
e0020e3072
- support to set the bugowner
...
- offer to send set_bugowner request if target is not writeable
- bugowner call is just an alias for maintainer call now
2012-11-23 12:52:05 +01:00
8d8d72a21f
- support default maintainer/bugowner search based on binary package names
2012-11-22 11:37:32 +01:00
7353cf99d7
support single binary download via getbinaries command
2012-11-19 10:21:24 +01:00
52e27750e4
- add support for delete requests.
2012-11-13 13:20:09 +01:00
Marcus Huewe
1fe51dc482
- do_repairlink: support "osc repairlink prj/pkg" syntax
2012-11-01 20:02:14 +01:00
Marcus Huewe
b8dedd3f8f
- request_interactive_review: support "-f" parameter to force a request state change
2012-10-26 15:19:00 +02:00
Marcus Huewe
6c5806c21e
- parse_repoarchdescr: also glob for a PKGBUILD file
...
There's no guessing for arch's PKGBUILD files (the backend
does not do any guessing, too)
2012-10-19 13:44:26 +02:00
Marcus Huewe
a82a1d7fa3
- parse_repoarchdescr: there's no need to use os.path.basename
2012-10-19 13:41:44 +02:00
15b27b7ff1
- add osc mr --cleanup option
2012-10-10 15:55:10 +02:00
Marcus Huewe
a8d26db675
Merge branch 'master' of github.com:openSUSE/osc
2012-09-20 01:20:23 +02:00
Marcus Huewe
dd48ee4730
- fixed bug #10 ("Traceback of an error in an exception handler")
...
Changed behaviour of "osc mv". Now it is also possible to move files
between different packages, that is "osc mv pkg1/foo pkg2/bar".
2012-09-20 01:18:38 +02:00
eef243f6be
Update help text
2012-09-10 13:49:21 +02:00
4b44e7470b
update default list of request states
...
Hi,
"declined" was some time ago changed to be considered an "open" request state.
the default behavior of "osc rq list" is IMHO to show open requests (requests
in state new or review), so I'm attaching a patch that adds "declined" as
well.
Tia,
Dirk
From 73fd10a2203be8e9dc215106648b2d9686d8fdc5 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 10 Sep 2012 10:40:48 +0200
Subject: [PATCH] add 'declined' to list of default states for rq list
osc rq list should show all currently "open" requests. "declined"
is an open request state, so it should be included by default.
2012-09-10 11:29:16 +02:00
Ludwig Nussel
a0cad9f88d
display source packgae name when searching for binaries
2012-07-03 14:16:40 +02:00
bd9d628ccc
- and escape correctly
2012-06-30 11:23:43 +02:00
52014ba11e
- fix creator name in forwarded requests
2012-06-30 11:20:12 +02:00
68b59f29a1
- do not forward submit requests which do link to original request target anyway
2012-06-29 10:57:29 +02:00
d6aed9858d
- default to forward submit requests
2012-06-27 10:34:20 +02:00
09c66f1d3d
- better use standard function for submit request (adds revision by default)
2012-06-26 17:48:39 +02:00
ceb3265a9d
- add request forward functionality similar to webui
2012-06-26 17:13:33 +02:00
Marcus Huewe
e4090f7932
- support "osc rq co <id>" also for action type "maintenance_release"
2012-05-04 17:18:46 +02:00
Marcus Huewe
60ed892beb
- "osc review show -G group" respect group in interactive review
...
(Note: the group is ignored when using the --edit option)
2012-05-03 22:30:50 +02:00
79d970f885
- support also plain "osc mr" from package checkout
2012-05-03 13:51:11 +02:00
Marcus Huewe
b38dd0191f
- request_interactive_review: automatically accept/decline a review for a specific group (if a group was specified)
...
To enable this feature set the newly introduced "review_inherit_group"
config option to True.
2012-04-27 15:04:06 +02:00
5703b90ca1
- support building with "--alternative-project --noinit" combination of not existing package.
2012-04-11 11:57:03 +02:00
747bca7741
- do not crash when give 5 arguments to "osc whatdependson" (bnc#719691)
2012-04-04 14:34:47 +02:00
cd89d91d13
- fix "osc result" handling (bnc#710682)
2012-04-04 10:28:27 +02:00
Marcus Huewe
e65bd21c3b
- "osc review": only show new reviews if by_user, by_group etc. is specified
...
The current implementation is so ugly...
2012-04-03 19:21:06 +02:00
Michael Schroeder
8df38af7e3
support archlinux builds
2012-04-03 16:00:06 +02:00
c744710145
- use right apiurl on "osc meta $KIND" command (bnc#640770)
2012-04-02 13:38:06 +02:00
Marcus Huewe
5b3725096f
- fixed #754774 ("'osc service rr' optional arguments don't work; doesn't match 'remoterun'")
2012-03-29 19:33:41 +02:00
Marcus Huewe
e2aa5cc65c
- do_update: rewrote code path for expanding/unexpanding a wc
...
The way for determining the revision was completely "wrong".
2012-03-28 23:14:28 +02:00
Marcus Huewe
25c4cb1cc1
- do_update: print the correct revision when unexpanding the wc
...
The old "p.linkinfo.lsrcmd5" was completely misleading because update to the
latest rev...
2012-03-28 22:58:09 +02:00
Marcus Huewe
081037e913
- do_update: use "rev" instead of "lsrcmd5" when running "osc up -u"
2012-03-27 18:38:00 +02:00
8d5cc0a8d6
- fix link to OBS maintenance chapter
2012-03-26 15:46:38 +02:00
82880e9572
- improve error message when calling patchinfo in standard package.
2012-03-23 09:37:08 +01:00
ce9f504105
- add unlock command for osc 0.134.1
2012-03-15 09:55:37 +01:00
Marcus Huewe
346b754941
- added "review show" command to help text
2012-03-06 13:25:47 +01:00
Marcus Huewe
65858bb6d3
- support "review show <id>" (alias for "request show <id>")
2012-03-06 13:22:25 +01:00
6860e7edff
- set vrev on current links in link files
2012-03-02 15:44:15 +01:00
15da5e9580
- follow changed issue xml schema
2012-02-29 15:57:58 +01:00
96042a3194
- simplify "setlinkrev" call and do the right thing by default.
2012-02-29 11:51:40 +01:00
793d9ec961
- create submit requests with correct revisions when target is not link target and a service is used. We had missing service files so far after request accept.
2012-02-24 11:50:24 +01:00
Sascha Peilicke
d8904685da
[osc] Also provide '--noservice' parameter to 'osc commit'.
...
It is already used for 'osc build' and much shorter than '--skip-local-service-run'
2012-02-23 14:27:04 +01:00
a9b51e3571
- take care about build --noservice
2012-02-23 13:21:22 +01:00
d50f06fec1
- follow changed policy for inident requests
2012-02-21 18:02:21 +01:00
Marcus Huewe
7fc2f02f33
- do_results: ignore _oldstate key when printing the results in csv format
2012-02-21 14:17:57 +01:00
00286be354
- don't crash on invalid attribute names
2012-02-21 12:41:24 +01:00
Marcus Huewe
09a7f60ede
- fixed "osc results --csv" in a project wc
2012-02-21 13:13:36 +01:00
9960072d5c
- set releaseproject in incident requests
2012-02-15 17:08:06 +01:00
3820c19c9d
- fix cleanup handling of maintenance request
2012-02-15 13:13:44 +01:00
ba08ccb48a
- add single-package-maintenance branch
2012-02-09 10:04:44 +01:00
Ludwig Nussel
f760282ea4
whois: display user info suitable for c&p in mail client
...
allow multiple arguments
2012-02-07 11:08:32 +01:00
Ludwig Nussel
f53e40b2fd
sr: use link target package also when called with one argument
2012-02-07 11:03:21 +01:00
Adam Spiers
3ed94d9694
Fix 'chache' typo
2012-02-02 10:49:17 +00:00
4466a7f701
- fix superceeding of submit requests, match all exact matches independend of user and include "declined"
2012-01-26 13:27:44 +01:00
e54da78499
- add "osc my work" which works in same way as webui
2012-01-26 13:27:44 +01:00
4aa3463438
- fix description of "osc results --watch" switch
2012-01-24 09:59:23 +01:00
49d91c373d
- add "osc results --watch" command to wait for build results in efficient way
2012-01-23 17:26:53 +01:00
a2030b9f15
- add "request setincident" command
2012-01-19 11:43:37 +01:00
11be969b77
- maintenance requests accept package lists as source and target incidents to be merged in
2012-01-19 11:36:57 +01:00
Ludwig Nussel
0bdd0a676e
slash separate sm output
2012-01-18 16:50:47 +01:00
Michael Schroeder
4a1cc2cc88
- the help says 'implies --binary', make it so
2012-01-13 17:43:32 +01:00
Michael Schroeder
754897d905
add --binaryversion option
2012-01-13 15:18:33 +01:00
e0683d074c
- use qemu as fallback when arch is not supported (unable to test it because of broken binfmt misc)
2012-01-12 13:47:31 +01:00
94a670e067
- patchinfo call can work without checked out copy now
2012-01-09 11:29:11 +01:00
bb373a9c9d
- use correct target package name on branch result (when --extend-package-names or when devel package is set)
2012-01-05 17:15:39 +01:00
3651508724
- use cmd=branch&dryrun=1 for search of maintained packages to get same result as on branching
2012-01-05 16:16:13 +01:00
Dirk Mueller
836423d2cf
fix handling of -u parameter in mbranch
2012-01-05 14:41:02 +01:00
Dirk Mueller
285dc40a8a
fix handling of --attribute in mbranch
2012-01-05 14:40:57 +01:00
4e7867e3cd
- fix "ldiff" command, it crashed due to inexistent md5sum in linked package
2012-01-04 13:27:31 +01:00
Marcus Huewe
3aeff9e0d0
- removed debug stuff...
2011-12-20 18:42:03 +01:00
b3e1321ad6
- fix patchinfo new creation call
2011-12-16 15:29:54 +01:00
89edcc32ec
- move declined requests in "my rq" to the bottom
2011-12-16 09:44:57 +01:00
bede808271
- offer to supersede requests in declined state on creating a new submit request
2011-12-15 15:50:11 +01:00
c076e2b4d2
- show declined requests to the creator on "my rq" function
2011-12-15 15:35:11 +01:00
2e2deb3ec8
- support link or branch from not-yet-existing-packages to pre-define the later submit target
2011-12-15 15:12:41 +01:00
Sascha Peilicke
2950d89be4
Clarify link / branch difference
...
Should fix bnc#723578
2011-12-12 12:57:13 +01:00
46555269e6
- fix typo
2011-12-06 13:22:50 +01:00
a5edbb201a
- add support for new branch --extend_package_names
2011-12-01 15:54:50 +01:00
f47e8f16c7
- support updating of existing _patchinfo files
2011-11-30 10:52:50 +01:00
fdde366daf
- be a bit more verbose on copypac comment (to see which options where used)
2011-11-25 13:05:41 +01:00
b659ad5285
- support new branch add_repositories api call
2011-11-25 10:12:16 +01:00
Marcus Huewe
da745728cc
- do_log: support -r rev1:rev2 (revision ranges)
...
This obviously only work for "plain" revisions
2011-11-22 20:13:52 +01:00
ce1bcee552
- support "serveronly" source service
2011-11-22 14:47:11 +01:00
49cdfa4fe3
- add --keep-link option to copypac command
2011-11-21 12:33:32 +01:00
Marcus Huewe
34454ac91d
- do_vc: fixed #719754 ("osc vc fails with 'User not found'")
2011-11-18 22:48:50 +01:00
Marcus Huewe
ac10fd798d
- do_getbinaries: minor cosmetic change
2011-11-18 21:52:30 +01:00
Marcus Huewe
da88ec0a39
- fixed #713178 ("osc getbinaries in project scope throws error")
2011-11-18 21:51:03 +01:00
Marcus Huewe
64224f9668
- core.set_link_rev: return revision
...
- do_setlinkrev: print the revision which is stored in the 'rev' attribute (if rev is not None)
2011-11-17 21:33:57 +01:00
0f1ae28bf0
- new patchinfo is now default on server, old format not anymore supported on purpose.
...
So removing the switch is also on purpose to make people aware of it.
2011-11-11 10:51:24 +01:00
Marcus Huewe
0973931793
- rewrote b190f27d00 (support "osc co --output-dir..." option)
...
The initial version was written by Ed Bartosh <eduard.bartosh@intel.com>
2011-11-02 21:05:10 +01:00
Marcus Huewe
17a5242110
Revert "implemented --output-dir command line option"
...
This reverts commit b190f27d00
2011-11-02 21:05:09 +01:00
eac124f9f6
- support source cleanup on maintenance incidient requests
2011-10-31 12:06:52 +01:00
Ed Bartosh
b190f27d00
implemented --output-dir command line option
2011-10-10 17:06:58 +02:00
fade823e06
- exclude also nosrc.rpm on getbinaries
2011-10-09 11:23:00 +02:00
Marcus Huewe
7995613991
- revert 3834263171
...
- fixed "parse_repoarchdescr": don't ignore repo if the repo name is a
supported arch name
2011-09-30 14:57:03 +02:00
3834263171
- fix building with "osc build $REPO $ARCH"
2011-09-30 14:26:58 +02:00
da7445c192
- become curl compatible, switch to "PUT" method when using -T upload file parameter
2011-09-23 12:11:14 +02:00
d3dd8539d9
- fallback to "build --local-package" if it does not exist instead of complaining
2011-09-12 16:15:19 +02:00
Ruediger Meier
9c004acf34
- re-add but ignore deprecated option --skip-validation
...
Doing this to not brake scripts where this option is used.
This Patch is a follow-up of
568612ce
2011-09-11 17:13:32 +02:00
Marcus Huewe
27ca263d37
- do_revert: added note again which was removed in the previous commit (only affects the docstring)
2011-09-09 19:55:19 +02:00
Ruediger Meier
57329183d1
osc revert, how to do it?
...
On Friday 09 September 2011, Marcus Hüwe wrote:
> > Is this the supposed behavior?
>
> No - I just fixed it in git master.
Thx!
BTW
even I've investigated it for svn (because osc may supposed to be similar).
But the misbehavior is the same there. Do you think that's a bug in svn too?
At least svn reverts completely when doing
svn revert -R .
Probably would be also nice to say something about it in osc revert --help,
e.g. like this
From 3fa9bb1ac29c623f8ee24f435e7eebd073273e1a Mon Sep 17 00:00:00 2001
From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Fri, 9 Sep 2011 19:08:50 +0200
Subject: [PATCH] - do_revert: add help msg about reverting wc entirely
2011-09-09 19:53:40 +02:00
Marcus Huewe
5007751215
- do_revert: also revert added files by default
2011-09-09 17:37:01 +02:00
Marcus Huewe
30ba376302
- do_build: also consider "local_service_run" config option
2011-09-07 16:53:11 +02:00
Marcus Huewe
3683d9550d
- added "local_service_run" config option
...
can be used to permanently disable the local service run on commit
(default: enabled)
2011-09-07 15:19:54 +02:00
568612cedc
- drop hardcoded source validator executions
2011-09-07 13:55:05 +02:00
Sascha Peilicke
3619f392a0
Reopening reviews only works for requests in state 'new' or 'review'
2011-08-18 16:02:34 +02:00
Michal Marek
c7e5819b7c
Do not check for untracked files before commit
...
This duplicates the work of the source validator and is just annoying.
Suggested-by: Michal Vyskocil <mvyskocil@suse.cz>
Signed-off-by: Michal Marek <mmarek@suse.cz>
2011-08-16 11:33:56 +02:00
0ba9383e17
- checkout of entire project is skipping packages which links to project local packages by default.
2011-07-20 17:27:05 +02:00
1630792e21
- fix DISTURL help
2011-07-20 17:17:56 +02:00
dce5c8b4fc
- show created incident project
2011-07-19 18:05:32 +02:00
Sascha Peilicke
438569f821
PEP8-ified parts of the code.
...
Exchange individual return statements with a finally statement in the
big try/except statement in babysitter.py. If you return a different
value in the 'except' clause, it takes precedency over the 'finally'
clause (finally is executed before returning, naturally).
2011-07-08 16:09:44 +02:00
Sascha Peilicke
6676d530bc
Give some status output if request list was empty.
...
Either there where no requests or the project didn't exist.
Fixes bnc#543999
2011-07-08 15:11:17 +02:00
Sascha Peilicke
93f87c9838
Honor '-p' and '-P' parameters in request list command.
...
Fixes bnc#703586
2011-07-07 10:12:57 +02:00
e6f631ebe8
- crash fix on maintenance incident creation with given project
2011-06-27 14:37:08 +02:00
Sascha Peilicke
0de8953952
Revert "Align --no-service commit command parameter to build command param"
...
This reverts commit d22b2a6523
2011-06-17 11:02:57 +02:00
Sascha Peilicke
d22b2a6523
Align --no-service commit command parameter to build command param
...
style.
2011-06-16 12:06:03 +02:00
881641d479
- do not run source services on local packages or offline builds, but warn about that
2011-06-15 14:17:33 +02:00
eb6a42713d
- fix broken update after commit with service run
...
- fix up -S on unexpanded checkouts
2011-06-09 17:22:49 +02:00
Petr Uzel
95febe963b
osc co: print help instead of crashing if no arguments are given
...
This fixes:
~> osc checkout
Traceback (most recent call last):
File "/usr/bin/osc", line 21, in <module>
r = babysitter.run(osccli)
File "/usr/lib/python2.7/site-packages/osc/babysitter.py", line 52, in run
return prg.main()
File "/usr/lib/python2.7/site-packages/osc/cmdln.py", line 310, in main
return self.cmd(args)
File "/usr/lib/python2.7/site-packages/osc/cmdln.py", line 333, in cmd
retval = self.onecmd(argv)
File "/usr/lib/python2.7/site-packages/osc/cmdln.py", line 449, in onecmd
return self._dispatch_cmd(handler, argv)
File "/usr/lib/python2.7/site-packages/osc/cmdln.py", line 1179, in _dispatch_cmd
return handler(argv[0], opts, *args)
File "/usr/lib/python2.7/site-packages/osc/commandline.py", line 3386, in do_checkout
m = re.match(r"obs://([^/]+)/(\S+)/([^/]+)/([A-Fa-f\d]+)\-(\S+)", args[0])
IndexError: tuple index out of range
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
2011-06-08 14:59:12 +02:00
Michal Čihař
c14f81c1f2
Fix spelling
2011-06-08 12:10:47 +02:00
a6716337f5
- add the --meta handling also to list, cat and less commands
2011-06-08 10:25:15 +02:00
9d6da6700e
- fix error message
2011-06-06 14:43:01 +02:00
946ac03dae
- add 'requestbugownership' command for setting the bugowner via request
2011-06-01 09:50:30 +02:00
Vincent Untz
3dca0702c5
osc pdiff ("parent diff")
2011-05-30 13:19:19 +02:00
21bb30325e
- do not search for requests, if one got specified via -s parameter
2011-05-26 17:13:06 +02:00
48fc059e0b
- fix changelog comments take over to commit log
2011-05-26 16:39:40 +02:00
8dd0d9f8e3
- rdelte and undelete operate with history comment now
2011-05-26 10:21:14 +02:00
593acbb843
- run source services always verbose on "osc build"
2011-05-25 13:45:54 +02:00
48a8fa144f
- support for local defined source services during commit. Move old validation and trylocal source service run into commit function
2011-05-25 13:34:32 +02:00
c00751f4d7
- handle errors of source service runs
2011-05-24 10:49:08 +02:00
0a7492cdf8
- fix description of rdelete commands and make a difference to enforce it on server side or to ignore the content. Famous rm -rf command exists now :)
2011-05-23 20:43:35 +02:00
22e4047005
- support the new source service file mode of OBS 2.3 Beta 2
2011-05-23 15:26:13 +02:00
3408f57078
- use merged srcmd5sum as default revision on submit request creation, if link target is not submit target.
...
This allows to create multiple submit requests from same source, if one of them is to the link target.
Otherwise merge conflicts will occur
2011-05-19 17:11:37 +02:00
