← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/Main/src-client/GuestCtrlImplTasks.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/src-client/GuestCtrlImplTasks.cpp
464
464
                                                     Guest::tr("Source file \"%s\" does not exist, or is not a file"),
465
465
                                                     aTask->strSource.c_str());
466
466
        }
 
467
        else
 
468
            rc = GuestTask::setProgressErrorInfo(rc, aTask->progress, pGuest);
467
469
 
468
470
        /* Query file size to make an estimate for our progress object. */
469
471
        if (SUCCEEDED(rc))
538
540
 
539
541
                RTFILE hFileDest;
540
542
                int vrc = RTFileOpen(&hFileDest, aTask->strDest.c_str(),
541
 
                                     RTFILE_O_READWRITE | RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE);
 
543
                                     RTFILE_O_WRITE | RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE);
542
544
                if (RT_FAILURE(vrc))
543
545
                    rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
544
546
                                                         Guest::tr("Unable to create/open destination file \"%s\", rc=%Rrc"),
557
559
                        {
558
560
                            if (!aOutputData.size())
559
561
                            {
560
 
                                if (cbToRead)
 
562
                                /*
 
563
                                 * Only bitch about an unexpected end of a file when there already
 
564
                                 * was data read from that file. If this was the very first read we can
 
565
                                 * be (almost) sure that this file is not meant to be read by the specified user.
 
566
                                 */
 
567
                                if (   cbTransfered
 
568
                                    && cbToRead)
 
569
                                {
561
570
                                    rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->progress,
562
 
                                                                         Guest::tr("Unexpected end of file \"%s\" (%u bytes left)"),
563
 
                                                                         aTask->strSource.c_str(), cbToRead);
 
571
                                                                         Guest::tr("Unexpected end of file \"%s\" (%u bytes left, %u bytes written)"),
 
572
                                                                         aTask->strSource.c_str(), cbToRead, cbTransfered);
 
573
                                }
564
574
                                break;
565
575
                            }
566
576