Skip to content

Commit fb863c3

Browse files
authored
Merge pull request #11465 from 2403905/issues/11369
[OCISDEV-141] Fix storage-users cli
2 parents d780a50 + 443c8b6 commit fb863c3

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Bugfix: Fix storage-users cli
2+
3+
Fix storage-users uploads --resume command.
4+
5+
https://github.com/owncloud/ocis/pull/11464
6+
https://github.com/owncloud/ocis/issues/11290

services/storage-users/pkg/command/uploads.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func ListUploadSessions(cfg *config.Config) *cli.Command {
131131
}
132132

133133
var stream events.Stream
134-
if c.Bool("restart") {
134+
if c.Bool("restart") || c.Bool("resume") {
135135
stream, err = event.NewStream(cfg)
136136
if err != nil {
137137
fmt.Fprintf(os.Stderr, "Failed to create event stream: %v\n", err)

tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,5 @@ The expected failures in this file are from features in the owncloud/ocis repo.
393393

394394
- [apiSharingNgDriveLinkShare/createInternalLinkShare.feature:339](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSharingNgDriveLinkShare/createInternalLinkShare.feature#L339)
395395

396-
#### [[CLI] Error while resuming an upload](https://github.com/owncloud/ocis/issues/11290)
397-
398-
- [cliCommands/uploadSessions.feature:162](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/cliCommands/uploadSessions.feature#L162)
399-
400396
Note: always have an empty line at the end of this file.
401397
The bash script that processes this file requires that the last line has a newline on the end.

0 commit comments

Comments
 (0)