Merge lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module

Proposed by Chris Hillery on 2013-01-16
Status: Merged
Approved by: Chris Hillery on 2013-01-17
Approved revision: 46
Merged at revision: 46
Proposed branch: lp:~zorba-coders/zorba/bug1100380
Merge into: lp:zorba/archive-module
Diff against target: 44 lines (+3/-13)
1 file modified
src/archive_module.xq.src/archive_module.cpp (+3/-13)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug1100380
Reviewer Review Type Date Requested Status
Chris Hillery Approve on 2013-01-17
Cezar Andrei 2013-01-16 Approve on 2013-01-17
Review via email: mp+143607@code.launchpad.net

Commit message

-Replaced open functions with old ones to make it work with Macports

To post a comment you must log in.
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug1100380-2013-01-16T22-22-25.468Z is finished. The final status was:

All tests succeeded!

Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Pending.

Cezar Andrei (cezar-andrei) wrote :

Works fine with Macports now.

review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug1100380-2013-01-17T00-36-42.21Z is finished. The final status was:

All tests succeeded!

Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve.

Chris Hillery (ceejatec) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug1100380-2013-01-17T11-08-42.647Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug1100380-2013-01-17T11-38-40.881Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/archive_module.xq.src/archive_module.cpp'
2--- src/archive_module.xq.src/archive_module.cpp 2012-09-18 21:44:28 +0000
3+++ src/archive_module.xq.src/archive_module.cpp 2013-01-16 22:18:22 +0000
4@@ -919,15 +919,7 @@
5 base64::attach(*theData.theStream);
6 }
7
8- lErr = archive_read_set_read_callback(
9- theArchive, ArchiveItemSequence::readStream);
10- ArchiveFunction::checkForError(lErr, 0, theArchive);
11-
12- lErr = archive_read_set_callback_data(
13- theArchive, &theData);
14- ArchiveFunction::checkForError(lErr, 0, theArchive);
15-
16- lErr = archive_read_open1(theArchive);
17+ lErr = archive_read_open(theArchive, &theData, NULL, ArchiveItemSequence::readStream, NULL);
18 ArchiveFunction::checkForError(lErr, 0, theArchive);
19 }
20 else
21@@ -1515,7 +1507,6 @@
22 //updated with the new Files specified
23 ArchiveCompressor lResArchive;
24 ArchiveOptions lOptions;
25- bool lHasItem = false;
26
27 Item lItem;
28 Iterator_t lSeqIter = lSeq->getIterator();
29@@ -1523,13 +1514,12 @@
30 //read first header and file of the archive so we can get the options before creating
31 //the new archive.
32 lSeqIter->open();
33- lHasItem = lSeqIter->next(lItem);
34+ lSeqIter->next(lItem);
35 //set the options of the archive
36 lOptions = lSeq->getOptions();
37 //create new archive with the options read
38 lResArchive.open(lOptions);
39- //if (!lItem.isNull())
40- if (lHasItem)
41+ if (!lItem.isNull())
42 {
43 do
44 {

Subscribers

People subscribed via source and target branches

to all changes: