← Back to branch summary

~ubuntu-branches/ubuntu/saucy/apt/saucy

« back to all changes in this revision

Viewing changes to cmdline/apt-mark.cc

  • Committer: Package Import Robot
  • Author(s): Michael Vogt, Michael Vogt, TJ
  • Date: 2012-08-28 12:06:48 UTC
  • mfrom: (1.4.53 sid)
  • Revision ID: package-import@ubuntu.com-20120828120648-lbw0q0611jn030bx
Tags: 0.9.7.5ubuntu1
https://launchpad.net/bugs/1008289
[ Michael Vogt ]
* merged latest fixes from the debian-sid branch

[ TJ ]
* apt-pkg/contrib/netrc.cc:
  - increase LOGINSIZE/PASSWORDSIZE limits and add proper error
    if the limits are reached (LP: #1008289)

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmdline/apt-mark.cc
291
291
   FILE* dpkg = fdopen(external[1], "w");
292
292
   for (APT::PackageList::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
293
293
   {
 
294
      if (dpkgMultiArch == false)
 
295
         fprintf(dpkg, "%s", Pkg.FullName(true).c_str());
 
296
      else
 
297
      {
 
298
         if (Pkg->CurrentVer != 0)
 
299
            fprintf(dpkg, "%s:%s", Pkg.Name(), Pkg.CurrentVer().Arch());
 
300
         else if (Pkg.VersionList().end() == false)
 
301
            fprintf(dpkg, "%s:%s", Pkg.Name(), Pkg.VersionList().Arch());
 
302
         else
 
303
            fprintf(dpkg, "%s", Pkg.FullName(false).c_str());
 
304
      }
 
305
 
294
306
      if (MarkHold == true)
295
307
      {
296
 
         fprintf(dpkg, "%s hold\n", Pkg.FullName(!dpkgMultiArch).c_str());
 
308
         fprintf(dpkg, " hold\n");
297
309
         ioprintf(c1out,_("%s set on hold.\n"), Pkg.FullName(true).c_str());
298
310
      }
299
311
      else
300
312
      {
301
 
         fprintf(dpkg, "%s install\n", Pkg.FullName(!dpkgMultiArch).c_str());
 
313
         fprintf(dpkg, " install\n");
302
314
         ioprintf(c1out,_("Canceled hold on %s.\n"), Pkg.FullName(true).c_str());
303
315
      }
304
316
   }