Ticket #2856 (closed defect: fixed)

Opened 7 years ago

Last modified 6 years ago

.xol install from journal

Reported by: cscott Owned by: dgilmore
Priority: blocker Milestone: Update.1
Component: sugar Version:
Keywords: Ship.2? Cc: sj, lauren, mako, cscott
Action Needed: Verified: no
Deployments affected: Blocked By:
Blocking:

Description

Trac #2715 made .xo install from the journal work; we should make .xol install work as well.

Hopefully this can be done before danw's forgotten what he did for #2715.

The .xol spec is at http://dev.laptop.org/ticket/2698

And trac #2698 seems to be related (and might be a dup).

Attachments

library.patch (1.6 kB) - added by erikos 6 years ago.
make_index path change and missing import
journal_library.patch (2.0 kB) - added by erikos 6 years ago.
recreate the index if missing in journal

Change History

  Changed 7 years ago by marco

Discussed with Eben a bit, we think interaction should be very similar to activity bundles:

  • Download a bundle with the web activity -> automatically saved to the journal
  • When a content bundle is saved to the journal it's also installed in the library path
  • When the bundle is removed from the journal it's also uninstalled from the library path

As an optimization we could later make the bundle in the journal just a reference to the installed one, to avoid wasting space. That would also make handling of the object more complex, obviously.

Details about the installation are in #2698

  Changed 7 years ago by jg

  • component changed from distro to sugar

follow-up: ↓ 4   Changed 7 years ago by lauren

  • cc lauren added

in reply to: ↑ 3   Changed 7 years ago by wenmi01

Replying to lauren:

Suggestion: additional tab for installed activity can be added to journal to separate the installed activity.

  Changed 7 years ago by kimquirk

  • milestone changed from First Deployment, V1.0 to Trial-3

  Changed 7 years ago by danw

basic support is now committed; the UI is not great (see #3152). Also, the content bundle support isn't actually useful until we install the library (#3153)

  Changed 7 years ago by danw

  • status changed from new to closed
  • resolution set to fixed

  Changed 6 years ago by sj

  • status changed from closed to reopened
  • resolution deleted
  • milestone deleted

This needs to be revisited to make it work from the journal (copying to the right place and running makeindex.py).

  Changed 6 years ago by sj

see also #4629 for how resume from journal should work.

  Changed 6 years ago by jg

  • milestone set to Update.1

  Changed 6 years ago by tomeu

  • owner changed from danw to tomeu
  • status changed from reopened to new

  Changed 6 years ago by marco

  • cc mako added

I think mako has a plan and was going to work on it. You might want to reassign the ticket.

  Changed 6 years ago by erikos

  • owner changed from tomeu to erikos

This is the fix in sugar we need for ship.2 so far.

diff --git a/lib/sugar/bundle/contentbundle.py b/lib/sugar/bundle/contentbundle.py
index 517ee9a..25b54c9 100644
--- a/lib/sugar/bundle/contentbundle.py
+++ b/lib/sugar/bundle/contentbundle.py
@@ -162,7 +162,7 @@ class ContentBundle(Bundle):
     def _run_indexer(self):
         os.spawnlp(os.P_WAIT, 'python',
                    'python',
-                   os.path.join(env.get_user_library_path(), 'makeIndex.py'))
+                   os.path.join('/usr/share/library-common', 'make_index.py'))

Just do testing to see if there is something else.

  Changed 6 years ago by mako

Yes. You'll need to the new 1.4 olpc-library-core and olpc-library-common RPMs which are in my joyride repository for that to work but, with those installed and the patch that erikos included applies, this problem will go away.

I think everyone on this bug can see their email for a full description of the plan (from my end, at least) and the current status of the issue.

In any case, we are very close.

Changed 6 years ago by erikos

make_index path change and missing import

  Changed 6 years ago by erikos

  • keywords Ship.2? added

Attached is the patch, which is pushed to git master as well. We will create a rpm for testing in joyride now.

Changed 6 years ago by erikos

recreate the index if missing in journal

  Changed 6 years ago by erikos

Mako and myself tested the changes above in joyride 357. I could install library bundles fine. So we need to have the patch for sugar and that for the journal to be cherry picked if we want to have that working in ship.2.

  Changed 6 years ago by mako

IRT eriko's last comment. This is, of course, in addition to the olpc-library-common and olpc-library-core packages (1-5 or whatever the latest version is).

  Changed 6 years ago by erikos

  • owner changed from erikos to ApprovalForUpdate

The sugar rpm has been built: http://koji.fedoraproject.org/koji/taskinfo?taskID=266578 so up to jim now if included in Ship.2

  Changed 6 years ago by jg

  • cc cscott added
  • owner changed from ApprovalForUpdate to dgilmore

I think this went into Ship.2, and clearly is OK for Update.1, and that this just didn't get closed out properly.

Dennis, please make sure the right things have happened.

  Changed 6 years ago by dgilmore

  • status changed from new to closed
  • resolution set to fixed

i have tagged sugar-0.70.3-1 for olpc2-ship2 and olpc2-update1 in koji

  Changed 6 years ago by mako

Yes. I can verify that this works in Ship.2.

Note: See TracTickets for help on using tickets.