[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1100380-2013-01-17T11-08-42.647Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
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 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1100380-2013-01-17T11-38-40.881Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
Validation queue job bug1100380-2013-01-17T11-38-40.881Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug1100380 into
lp:zorba/archive-module.
Commit message:
-Replaced open functions with old ones to make it work with Macports
Requested reviews:
Zorba Coders (zorba-coders)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607
--
https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607
Your team Zorba Coders is requested to review the proposed merge of
lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module.
=== modified file 'src/archive_module.xq.src/archive_module.cpp'
--- src/archive_module.xq.src/archive_module.cpp 2012-09-18 21:44:28 +
+++ src/archive_module.xq.src/archive_module.cpp 2013-01-16 22:18:22 +
@@ -919,15 +919,7 @@
base64::attach(*theData.theStream);
}
- lErr = archive_read_set_read_callback(
-theArchive, ArchiveItemSequence::readStream);
- ArchiveFunction::checkForError(lErr, 0, theArchive);
-
- lErr = archive_read_set_callback_data(
-theArchive, theData);
- ArchiveFunction::checkForError(lErr, 0, theArchive);
-
- lErr = archive_read_open1(theArchive);
+ lErr = archive_read_open(theArchive, theData, NULL, ArchiveItemSequence::readStream, NULL);
ArchiveFunction::checkForError(lErr, 0, theArchive);
}
else
@@ -1515,7 +1507,6 @@
//updated with the new Files specified
ArchiveCompressor lResArchive;
ArchiveOptions lOptions;
-bool lHasItem = false;
Item lItem;
Iterator_t lSeqIter = lSeq-getIterator();
@@ -1523,13 +1514,12 @@
//read first header and file of the archive so we can get the options before creating
//the new archive.
lSeqIter-open();
-lHasItem = lSeqIter-next(lItem);
+lSeqIter-next(lItem);
//set the options of the archive
lOptions = lSeq-getOptions();
//create new archive with the options read
lResArchive.open(lOptions);
-//if (!lItem.isNull())
-if (lHasItem)
+if (!lItem.isNull())
{
do
{
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module has been updated. Commit Message changed to: -Replaced open functions with old ones to make it work with Macports For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1100380-2013-01-16T22-22-25.468Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
Validation queue job bug1100380-2013-01-16T22-22-25.468Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
Review: Approve Works fine with Macports now. -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1100380-2013-01-17T00-36-42.21Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
Validation queue job bug1100380-2013-01-17T00-36-42.21Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module
The proposal to merge lp:~zorba-coders/zorba/bug1100380 into lp:zorba/archive-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 -- https://code.launchpad.net/~zorba-coders/zorba/bug1100380/+merge/143607 Your team Zorba Coders is subscribed to branch lp:zorba/archive-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
