1
0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-29 03:06:15 +01:00
Commit Graph

590 Commits

Author SHA1 Message Date
Michal Čihař
396b6299f2 Fix typos found by lintian. 2010-01-02 12:25:56 +01:00
Marcus Huewe
9560002d00 - adjusted help text 2009-12-30 21:54:57 +01:00
Marcus Huewe
77544e7b4f - cleanups 2009-12-30 15:10:11 +01:00
Marcus Huewe
f109054898 - escape attributes 2009-12-29 20:33:16 +01:00
Marcus Huewe
d75888fbd4 - fixed do_submitrequest 2009-12-26 14:25:58 +01:00
Marcus Huewe
bcbcf6426c - fix for 0a6ca4f6c2 (also adjusted variables) 2009-12-26 14:22:34 +01:00
Marcus Huewe
1f979150a5 - add a more helpful text (see also #558197) 2009-12-25 18:16:35 +01:00
Marcus Huewe
0a6ca4f6c2 - useless use of StringIO() 2009-12-25 17:37:53 +01:00
Marcus Huewe
b3c8cc9062 - do_maintainer(): support multiple --role <foo> options 2009-12-25 17:31:13 +01:00
Marcus Huewe
9e892b9e58 - do_maintainer(): cleanup + renamed "--bugowner_only" to "--bugowner-only" 2009-12-25 17:19:44 +01:00
Marcus Huewe
73a2d30180 - minor changes/"cleanups" 2009-12-25 00:39:13 +01:00
Marcus Huewe
59073eaff5 - cleanup: use exceptions 2009-12-25 00:08:29 +01:00
Marcus Huewe
a715077769 - code cleanup 2009-12-23 20:51:08 +01:00
Marcus Huewe
046d4c37e1 - cleanup: removed useless objects 2009-12-21 23:47:25 +01:00
Marcus Huewe
a6a223edec - added "--disable-publish" option to "linkpac" and "aggegratepac" 2009-12-21 14:24:33 +01:00
Pavol Rusnak
8998d8d8a4 add missing exception variable to except block 2009-12-20 20:42:54 +01:00
Marcus Huewe
0bf48f2b73 - added support to specify a default action if a submitrequest has been accepted 2009-12-19 14:44:51 +01:00
Marcus Huewe
b983f116eb - commit: check if "_pulled" file exists before removing it
- fixed indention
2009-12-17 20:20:35 +01:00
Michael Schroeder
72e6edc997 - first attempt at "osc pull" and "linkcontrol" 2009-12-17 17:16:56 +01:00
Ludwig Nussel
3285fafaac take sr apiurl from current dir also in two argument form 2009-12-15 17:42:23 +01:00
Ludwig Nussel
f78ac323a8 check apiurl aliases also for copypac -t 2009-12-15 17:42:23 +01:00
Marcus Huewe
f297c01d6e - small cleanups 2009-12-12 15:02:58 +01:00
3949066104 add "osc triggerreason", show detailed reason of a build trigger 2009-12-09 07:53:33 +01:00
35a3a07c62 Merge branch 'master' of gitorious.org:opensuse/osc 2009-12-09 06:55:15 +01:00
0b60db740c * Revert fetch-cpio support for now, too many complains due to broken
product building atm.
* add --link-source option for "osc build" to speed up product building
2009-12-09 06:53:27 +01:00
Pavol Rusnak
1dd6dee9ba remove exec flags from commandline.py and core.py 2009-12-08 14:19:23 +01:00
Marcus Hüwe
e3e32f0d2f - autodetect *.kiwi files too 2009-12-04 17:41:31 +01:00
Adrian Schröter
edc55d83ec add dependson and whatdependson commands 2009-12-04 16:20:17 +01:00
Michal Čihař
457b8345d1 Remove line of asterisks
This does not work for man page.
2009-12-04 13:42:15 +01:00
Ludwig Nussel
1ff4978b98 implement build --release 2009-12-01 13:36:11 +00:00
Ludwig Nussel
133bd7a613 sanitize osc repos command 2009-11-30 09:57:39 +00:00
Ludwig Nussel
b75f95773f better repourls command behavior
Instead of requiring the path to a package working copy either read the project from currernt dir or allow to specify project
2009-11-30 09:31:28 +00:00
Ludwig Nussel
b3ef949ed1 hide install command. just plain broken. 2009-11-30 09:31:22 +00:00
Ludwig Nussel
6fd0e98a73 more convenience for osc signkey 2009-11-26 10:56:28 +00:00
Ludwig Nussel
75bdc2e6c7 allow build in read-only directory 2009-11-26 09:52:26 +00:00
Michal Vyskocil
e57b3548c9 osc mv command 2009-11-24 16:25:48 +00:00
Ludwig Nussel
d47ebed9e0 --with and --without need to be array 2009-11-24 09:49:26 +00:00
7cc629bdad default to exact search now (faster results and less server load).
osc search -s is doing the old substring search now
2009-11-23 16:13:57 +00:00
2393044585 add "osc build --root" option to allow to specify build root directory.
(not only for mls ;)
2009-11-23 13:53:59 +00:00
Ludwig Nussel
f1e67f1479 print valid repos if buildlog, buildhist or jobhist are called with
wrong arguments for convenience
2009-11-23 10:13:19 +00:00
Ludwig Nussel
989d7fa5d0 allow to specify limit=0 so jobhist works with apis that don't support limit 2009-11-23 10:13:12 +00:00
881349eaff fix request listing with --type without given target or source 2009-11-20 16:06:05 +00:00
Ludwig Nussel
5e142d7fc9 print list of valid arguments for getbinaries 2009-11-20 14:35:57 +00:00
Thomas Schmidt
fd4cd7fa0a fix text 2009-11-20 13:30:55 +00:00
Marcus Hüwe
d5d3605652 - reverted r9064. Verify/adjust apiurl in conf.py instead 2009-11-18 20:31:08 +00:00
Michal Vyskocil
4a0df19660 Make read of email adress from oscrc more robust
Fix possible KeyError when mismatch of apiurl with or without ending
slash.
2009-11-18 15:03:49 +00:00
Dirk Mueller
921b78d93c osc maintainer: hide verbose information if verbose is
not used
2009-11-17 21:48:46 +00:00
f27fc0fd77 support review handling of requests (new "osc review accept/decline
$REQUEST_ID" command
2009-11-17 16:59:17 +00:00
Ludwig Nussel
4139db3e3d smarter ls -b
- list all repos/archs if not specified
- use project or package of the current dir if none specified
2009-11-17 13:39:46 +00:00
Ludwig Nussel
8f4bbb5718 initialize apiurl always 2009-11-16 09:42:58 +00:00
2e46311ecd show worker/id on jobhistory and make it faster by adding a default
limit of 20
2009-11-13 13:31:10 +00:00
bc6f77d1da * patchinfo runtime fixes
* support submit requests on project level, osc is checking which
  packages have changed and submits only the changed after asking back.
* add support for _patchinfo package submissions in "osc sr" on project level
2009-11-13 08:58:37 +00:00
81afb0fa4d basic patchinfo support, calling api for generate file and to edit it 2009-11-10 09:56:34 +00:00
Michal Vyskocil
cdb8fabcbb osc my - show maintained packages by default 2009-11-10 09:36:32 +00:00
Jürgen Weigert
e09d83c772 all *.py: TABS to spaces; osc build: counting packages during cache filling 2009-11-10 00:56:52 +00:00
Jan-Simon Möller
3226fb0f9b add PRJ PKG also as args of buildinfo and buildconfig 2009-11-06 19:52:28 +00:00
Jan-Simon Möller
7769144d55 osc jobhistory accepts now also PRJ [PKG] REPO ARCH - enables query if not in wd. 2009-11-06 18:47:54 +00:00
fbf63aae84 change "osc maintained" syntax to "osc sm" or "osc search --maintained"
as decided in Build Team Meeting.
2009-11-06 16:08:20 +00:00
Dirk Mueller
2d198006b8 implement -v for osc ls -b 2009-11-04 14:31:20 +00:00
Michal Marek
df8d70b5ad linkpac: default to cicount=copy if the link is in the same project, to avoid
one gotcha when building kernels
2009-11-02 21:02:58 +00:00
c0760b0938 add "osc maintained" shortcut command
=> implement me: show also bugowner and maintainer
2009-11-02 09:28:27 +00:00
33dcce48ce implement "mbranch" call as documented on
http://en.opensuse.org/Build_Service/Concepts/Maintenance
2009-11-02 08:32:15 +00:00
09a01158de support attribute default requests and including project attributes in
one request.
2009-10-30 10:18:44 +00:00
b9b8f36925 basic meta attribute features, to show, set, create or delete attributes
and their values
2009-10-30 09:40:46 +00:00
116f75fec8 * allow to limit the osc search results by the existens of attributes 2009-10-22 10:10:15 +00:00
Jürgen Weigert
bb6e27db24 - added 'osc bugowner' as a more intelligent version of 'osc maintainer -B'
- added option '-B' to osc maintainer, prints bugowner OR maintainer.
 - added 'osc req help' as convenience alias to 'osc help req'.
 - 'osc in' to be done. Its usage just prints a suggested zypper command line.
 - Incompatible change: osc se now prints Project Package, instead of 
   Package Project for easier copy&paste.
 - give better hint how to use osc vc without network connectivity.
 - added printing of cache statistices to osc build
 - implemented 'osc ls .' to take proj/pack name from current directory.
   * Incompatible change: 'osc ls' now defaults to 'osc ls .',
   * Use 'osc ls /' if you really want to list all projects.
   * This is meant as a proof of concept. I intend to generalize this usage of '.'
     for all osc commands. Feedback welcome.
2009-10-22 09:43:58 +00:00
Pavol Rusnak
661d927d38 code cleanup 2009-10-20 14:30:15 +00:00
9266647b0c - support 100% offline build when using "osc build --noinit ..."
-> buildinfo gets stored in local directory as .buildinfo.xml
2009-10-20 08:43:52 +00:00
b8a915b8a2 Revert half introduced incompatible changes 2009-10-16 19:56:33 +00:00
5a1183a3d3 revert incompatible one-off-super-special-osc-req command, fixes error message on each osc call. declare this version as 0.123 RC 1 2009-10-16 15:55:29 +00:00
9a674cbda7 another try 2009-10-16 14:33:55 +00:00
c782e8d643 improve signkey help message 2009-10-16 14:21:05 +00:00
82add8761a fix typo 2009-10-16 14:16:25 +00:00
d47bbd8819 add project key management command (osc signkey) 2009-10-16 14:12:55 +00:00
bd38438416 fix checkout of a package, which contains uploaded, but not commited
files. We use the latest committed version in that case.
2009-10-16 08:26:01 +00:00
Pavol Rusnak
5ef036a578 allow filtering by repo/arch in prjresults 2009-10-15 14:24:12 +00:00
Jürgen Weigert
0bcfa2a938 +- added 'osc req help' as convenience alias to 'osc help req'.
+- 'osc in' to be done. Its usage just prints a suggested zypper command
line.
+- Incompatible change: osc se now prints Project Package, instead of
Package Project
+  for easier copy&paste.
+
2009-10-08 14:40:06 +00:00
Jürgen Weigert
652e6b87f4 - 2009-10-08 14:21:43 +00:00
Ludwig Nussel
f9c2aaaf27 remove special case for 'se' to perform an exact match by default
zypper for example doesn't do that either.
2009-10-08 12:44:25 +00:00
Jürgen Weigert
6575669111 added expand_proj_pack() for suggested '.' handling. 2009-09-28 19:50:57 +00:00
Marcus Hüwe
4e30d9f946 - fixed get_request_list() call 2009-09-24 14:14:11 +00:00
Marcus Hüwe
3cfe9db980 - show pending requests after branching a package 2009-09-22 23:31:10 +00:00
Marcus Hüwe
0c5a9528e3 - check for pending requests after executing an action (e.g. checkout, update, commit). This check is disabled by default. (requested by darix) 2009-09-18 01:10:41 +00:00
Marcus Hüwe
6ca6a10955 - added support to checkout a request's source package (osc request co ID) 2009-09-16 21:39:45 +00:00
2d3be21964 adapt source update flags for new <option> block 2009-09-10 08:48:44 +00:00
Marcus Hüwe
cb16432cd9 - get rid of rpm-python:
* so far it was only used for querying rpms which can be done with the rpmquery module
- core.py:
  * removed data_from_rpm() and tag_to_rpmpy() methods
- util/rpmquery.py:
  * added staticmethod "query()"
- commandline.py, fetch.py:
  * use rpmquery module instead of rpm-python/data_from_rpm()
2009-09-09 15:28:21 +00:00
Michal Marek
e312cc1916 Unbreak 'osc api'
Commit 7947 doesn't mention do_api at all in it's log message, yet it breaks
it.
2009-09-08 13:24:54 +00:00
ab73a24162 ups ... 2009-09-08 11:16:21 +00:00
48e96a96fb + - make buildhist command usable without checked out package
+ - rename old "platform/s" names to "repository/ies" (internal cleanup only)
2009-09-08 08:14:27 +00:00
Jürgen Weigert
7ea7ecee3d - 2009-09-07 18:49:01 +00:00
e040ae85f5 - support modification flages on creation of submit request
(for auto update or clean up packages or to avoid it, when submit request got accepted)
- show request ids from package source logs
2009-09-05 13:46:55 +00:00
6648377870 * add python-keyring support
* We may remove direct gnome keyring support later (there are currently
  reports of users who can't access obs anymore when not using gnome)
* do not write passwords to .oscrc if keyring is available and used
2009-09-04 17:48:53 +00:00
d8160a957f and rever again the osc req shortcut.
Juergen, this conflicts with the old api call and you get a error
message on each osc call.
2009-09-04 16:02:59 +00:00
Marcus Hüwe
08cfb45142 - do_branch: interpolate 'getpac_default_project' config value in the help text 2009-09-03 21:32:36 +00:00
Jürgen Weigert
56d4f12dbd - make osc getpac really get the package (instead of branch only)!
- expanded several tabs to spaces.
 - added default project to new getpac and bco subcommand. .oscrc:getpac_default_project = OpenSUSE:Factory
   (not added to branch subcommand, to not interfere with its syntax.)
2009-09-03 18:08:43 +00:00
Jürgen Weigert
6babfdf04d - added missing code for 'osc sr -l [ID]'
- allow osc req as shortcut for osc request.
 - allow osc cat with one parameter, if it is a url.
 - core.py:makeurl() now prints the url for educational purposes if osc -v -v
2009-09-03 17:28:27 +00:00
c2cee79679 support source services better:
* offer updating version from server
* executing them locally on update or build
2009-09-03 14:56:48 +00:00
5f9127cd6c fix "my request" call (haven't I did this before ?) 2009-09-03 11:25:12 +00:00
fec32ed9e4 rejected is no valid request state. Even though it got used in the past
:/ (but this will fail in future)
2009-09-01 15:44:57 +00:00
9e67dae8b7 bring back sr --diff option 2009-08-28 07:33:16 +00:00
06dc5b9aae avoid warning about missing diff option during creating sr 2009-08-28 06:46:20 +00:00
80de17208d revert changes which introduce inconsitencies or will conflict with
later developments.
2009-08-27 13:32:55 +00:00
Michal Vyskocil
816a982acf added missing delPerson function
do_maintainer relly on delPerson, which did not exists. It is
taken from old delMaintainer function with role handling.
Fixed also some issues in do_maintainer role handling
2009-08-26 14:22:54 +00:00
Marcus Hüwe
e3c9e30ca0 - do_request list:
* --mine + --user and --all + --state options are mutually exclusive
  * fixed "--all" and "--state all" options
2009-08-21 21:31:45 +00:00
Marcus Hüwe
b0000b2834 - more or less only some minor cosmetic changes 2009-08-21 19:39:12 +00:00
Marcus Hüwe
1a5bb12218 - added support for config variables in a help text 2009-08-21 14:55:26 +00:00
Marcus Hüwe
f1c8847879 - conf: initialize config with the default values. This fixes the manpage generation problem 2009-08-21 12:03:09 +00:00
Jürgen Weigert
403576b952 - hack for _help_preprocess_cmd_option_list to survive setup.py build 2009-08-21 11:25:07 +00:00
Jürgen Weigert
f2a738d4b6 Thanks Marcus, for looking into my FIXME's -- I could have never done
that preprocess helper for --days myself.

0.121.jw03
 - fixed osc req list -U to not look into the local dir
 - added osc my ... pkg/prj/req  shorthand commands
 - add 'osc se' alias for 'osc search -e'
 - add -b -m -M to 'osc search'
2009-08-21 01:26:37 +00:00
Marcus Hüwe
5639b2b9a7 - added support to use config values in options' help text
- do_request: minor change in the --days option handling
2009-08-21 00:42:51 +00:00
Jürgen Weigert
83b1b5ca59 All in one go.
0.121.jw02
 - made rresults an alias for results. python decorators are a strange concept...
 - asserting that ~/.oscrc remains mode 0600
 - no more plain text passwords in ~/.oscrc, we store now as bz2+base64
 - added verbosity control -v -q. To be used in guess_proj_pack()
 - added 'll' and 'ls -l' as shorthand to 'list -v'
 - started to change to explicit dual license GPLv2 or GPLv3 to conform to Novell policy.
 - added revision parameter to show_upstream_srcmd5(), so that it can be used in do_cat later.
 - allowed both integer and srcmd5 revisions in meta_get_filelist()
 - added 'lL', 'LL': allowed -e and -v together in do_list(). Was an internal error before.
 - added cat -e, to cat a file through a link.
   'cat -e -r 3' expands through the third revision of the _link.
 - added subcmd bco as alias for branch -c
 - added default project to branch subcommand. .oscrc:branch_project = OpenSUSE:Factory
 - added primitive experimental support for .oscrc:checkout_no_colon = 1
 - suggest using svn when .svn found.
 - alias submitpac submitrequest
 - osc bco now continues to checkout after branch target exists error.
 - added .oscrc:plaintext_passwd=1 for backwards compatibility
 - moved core.py:exclude_stuff to .oscrc:exclude_glob and expand it to catch *.orig etc.
 - allowed req as alias for request.
 - bugfix get_request_list: use 'or' with multiple states, not 'and'.
 - added osc req list -s all; a shorthand for enumerating all states
 - osc req list no longer confuses creator with approver.
 - osc req list -D nnn limit to requests nnn days old.
 - osc req list now also shows requests from the the given package, not only to.
 - improved help texts with repairlink to point to osc resolved.
 - improved passx code when creating oscrc.
 - osc sr -l is now a shortcut for 'osc req list -M -a -t submit -D 0'
2009-08-20 19:28:05 +00:00
2a180fa346 new packages gets checked out expanded when using "osc up -e" in project
directory now.
2009-08-19 13:07:58 +00:00
Jan-Simon Möller
d2c9b0707d Add -a/-s all option to osc rq list. It preselects all states for the query. 2009-08-19 13:00:22 +00:00
Ludwig Nussel
1e8d490ae2 open editor to enter message for submit and other requests 2009-08-19 11:28:16 +00:00
Ludwig Nussel
7e3cbabd0d prompt for message also when comitting entire projects 2009-08-19 11:28:10 +00:00
Jan-Simon Möller
853c2c5dcb Add support for --overlay and --rsync-{src,dest} to build and osc.
--overlay OVERLAY
              Copy overlay filesystem to buildroot after installing
              all RPMs. This must be a valid directory.
--rsync-src RSYNCSRC
              Copy overlay folder (RSYNCSRC) to a folder (RSYNCDEST)
              inside the buildroot using rsync.
              It will "%define RSYNCDONE 1" for handling %setup in your
              specfile. E.g.:
              %prep
              %if 0%{?RSYNCDONE}
              %setup -n aaa_base -T -D -b 5 -b 7
              %else
              %setup -n aaa_base -b 5 -b 7
              %endif
--rsync-dest RSYNCDEST

Todo: tell rpmbuild not to delete the folders.
2009-08-18 21:28:33 +00:00
Marcus Hüwe
4e32d4dc41 - moved options check to the beginning 2009-08-11 23:01:03 +00:00
f01be2f625 * keep _service: files local only. 2009-08-07 12:18:15 +00:00
b25b248a2e do not crash, if nothing is specified. (#526401) 2009-08-07 09:25:34 +00:00
Michal Vyskocil
cfc9c2a1b2 Fixed help of do_commit, added info how disable checks 2009-08-05 05:54:12 +00:00
Marcus Hüwe
ddd9e0206d - added config option to disable the filelist check before commit permanently 2009-08-04 14:12:45 +00:00
Michal Vyskocil
724f577b41 More options in commit filelist change
osc commit check for '?' files can be supressed by -f/--force option

It also have more options. File can be easily added, removed or the
whole filelist should be opened in editor and edited (this is very close
to git rebase --interactive behavior).
2009-08-03 13:03:24 +00:00
Marcus Hüwe
365be249c3 - slightly modified version of David Greaves' <david@dgreaves.com> patch to add a --map-repo option to aggregatepac 2009-07-31 14:31:20 +00:00
Michal Vyskocil
2d1126b847 osc commit asks if some file has a '?' status 2009-07-31 11:32:34 +00:00
Dr. Peter Poeml
2900aecea4 osc rdiff: try to make the help text a little clearer 2009-07-27 20:03:01 +00:00
Marcus Hüwe
5d12cff640 - request list: project is optional too (if no project/package is specified list all) 2009-07-24 19:15:51 +00:00
21bd79bc56 fix change devel requests help 2009-07-23 08:01:31 +00:00
Marcus Hüwe
d2dee3c525 - it's 'osc' not 'svn';) 2009-07-15 21:16:34 +00:00
Marcus Hüwe
17a8ae894a - changed delete logic: only remove the localfile and keep the store file. The storefile is kept unless the wc is committed - this is useful for something like "osc revert".
- added delete_file() method to the Package class which takes care about the "file deletion logic"
2009-07-15 21:10:38 +00:00
Marcus Hüwe
964d921d39 - fixed do_copypac()
- copy_pac: when doing a client side copy don't do a commit for each file
2009-07-15 18:53:47 +00:00
Ludwig Nussel
8fcd6e3371 add -d option to sr to only show a diff
Much more convenient than having to assemble the rdiff command line
manually.
2009-07-13 09:36:19 +00:00
Michal Vyskocil
193c59c6dc osc wipebinaries: don't force --all parameter, if -r/--repo or -a/--arch is used 2009-07-07 14:31:59 +00:00
Michal Vyskocil
02434152f1 new osc rremove command 2009-07-07 14:30:15 +00:00
Stephan Binner
257ae15d20 improve osc request help 2009-07-07 14:15:39 +00:00
16d56fb2c4 do only ask to revoke sr if existing one contains a 'submit' type 2009-06-23 12:02:01 +00:00
Michal Cihar
804979d671 Same description for arguments PLATFORM and ARCH in all places. 2009-06-23 10:06:31 +00:00
87067cd0aa add --role option to maintainer command 2009-06-19 13:57:27 +00:00
Stephan Binner
c76ac4dd5e fix request help 2009-06-19 13:10:33 +00:00
7ef5e04cc9 * "osc maintainer" is following to the development project / package now
* "osc maintainer" list maintainer and bugowner roles now
* rename addDevelProject to setDevelProject since the devel element is
  only allowed once
2009-06-18 16:20:49 +00:00
d017b16426 * add "osc request list -t <type>" to list only submit, delete or
develchange requests
* fix support of listing requests with multiple actions
2009-06-18 13:49:23 +00:00
626aa36925 * bump version to 0.119.90 to show that this is a pre version
* support setlinkrev for entire projects (request from Moblin team)
* support setlinkrev -u for removing rev elements
2009-06-18 09:18:17 +00:00
Marcus Hüwe
8f2a3b7580 - renamed OpenSUSE to openSUSE (I think that's the correct spelling atm) 2009-06-17 18:19:45 +00:00
Michal Cihar
a574dbb3aa Add proper escaping of - in man page. 2009-06-17 09:28:10 +00:00
Michal Cihar
2af8cbbf7e Missing preposition. 2009-06-16 13:31:11 +00:00
4c60d1b285 rename "rebuildpac" to "rebuild", but keep "rebuildpac" as alias.
This command works also for whole projects and we get rid of another
place of pac/pkg statements.
2009-06-15 15:38:39 +00:00
60ecca1dc1 new osc linkpac -f to allow to override existing _link files, patch by
Michael Meeks
2009-06-15 15:19:16 +00:00
Michal Vyskocil
b611ddb00b do not produce traceback if list of platforms is empy 2009-06-11 11:38:06 +00:00
Michal Vyskocil
d85d38f613 smarter default platform for osc build 2009-06-11 11:32:58 +00:00
Dr. Peter Poeml
8aadd6e400 osc search: shorten the if branch by eliminating the late else. No functional
change should result from this.
2009-06-09 17:07:02 +00:00
Dr. Peter Poeml
51726bb28b osc search: sort search results. 2009-06-09 17:04:31 +00:00