summaryrefslogtreecommitdiff
path: root/cmdline/apt-cdrom.cc
AgeCommit message (Collapse)AuthorFilesLines
2015-11-29drop some needlessly public declarations in libapt-privateDavid Kalnischkies1-2/+2
Git-Dch: Ignore
2015-11-29use function pointers instead of weak symbols for cmdline parsingDavid Kalnischkies1-1/+1
Passing function pointers around while working on this was very icky, but if weak symbols are too much to ask for… Reverts "do not use "-Wl,-Bsymbolic-functions" during the build to avoid breakage" aka a5fc9be36211a290a7abc3ca2a8bf98943bc1f57.
2015-11-04revamp all tools help messagesDavid Kalnischkies1-18/+4
The general idea is: A small paragraph on the tool itself as a description, a list of the most used (!= all) commands available in the tool, a remark where to find more information on the tool and its commands (aka: in the manpage) and finally a common block referring to even more manpages. In exchange options are completely omitted from the output as well as deprecated or obscure commands. (Better) Information about them is available in the manpages anyway and the few options which were listed before were also the least interesting ones (-o -c -q and co are hardly of interest for someone totally new looking to find info by asking for help and anyone with a bit of experience doesn't need this short list. Those would need a list of options applying to the command they call, but they are too numerous and command specific to list them sanely in this context.
2015-11-04deal with --version more centrallyDavid Kalnischkies1-14/+2
Git-Dch: Ignore
2015-11-04move apts cmdline helper type into -privateDavid Kalnischkies1-3/+2
Its not as simple as I initially thought to abstract this enough to make it globally usable, so lets not pollute global namespace with this for now. Git-Dch: Ignore
2015-11-04generate commands array after config is loadedDavid Kalnischkies1-6/+9
This ensures that location strings loaded from a location specified via configuration (Dir::Locale) effect the help messages for commands. Git-Dch: Ignore
2015-11-04deduplicate main methodsDavid Kalnischkies1-15/+5
All mains pretty much do the same thing, so lets try a little harder to move the common parts into -private to have the real differences more visible. Git-Dch: Ignore
2015-11-04split up help messages for simpler reuseDavid Kalnischkies1-18/+23
That is one huge commit with busy work only: Help messages used to be one big translateable string, which is a pain for translators and hard to reuse for us. This change there 'explodes' this single string into new string for each documented string trying hard to split up the translated messages as well. This actually restores many translations as previously adding a single command made all of the bug message fuzzy. The splitup also highlighted that its easy to forget a line, duplicate one and similar stuff. Git-Dch: Ignore
2015-08-12Replace all "press enter" occurrences with "press [Enter]"Luca Bruno1-1/+1
Thanks: Andre Felipe Machado for initial patch Closes: 414848
2015-08-10add c++11 override marker to overridden methodsDavid Kalnischkies1-4/+4
C++11 adds the 'override' specifier to mark that a method is overriding a base class method and error out if not. We hide it in the APT_OVERRIDE macro to ensure that we keep compiling in pre-c++11 standards. Reported-By: clang-modernize -add-override -override-macros Git-Dch: Ignore
2015-03-16stop displaying time of build in online helpJérémy Bobbio1-2/+2
As part of the “reproducible builds” effort [1], we have noticed that apt could not be built reproducibly. One issue is that it uses the __DATE__ and __TIME__ macros of the C preprocessor to display the time of build in the online help. We believe this information not to be really useful to users as they can always look at the package data and metadata to figure it out. The attached patch simply removes this information. All non-documentation packages can then be built reproducibly with our current experimental framework. [David: changed the string slightly to be untranslateable as well] Closes: 774342
2014-11-09use the same code to detect quiet setting in all toolsDavid Kalnischkies1-4/+3
Git-Dch: Ignore
2014-11-09streamline display of --help in all toolsDavid Kalnischkies1-13/+2
By convention, if I run a tool with --help or --version I expect it to exit successfully with the usage, while if I do call it wrong (like without any parameters) I expect the usage message shown with a non-zero exit.
2014-03-13remove code duplication for Add & Ident in apt-cdromDavid Kalnischkies1-121/+81
The preparation code to deal with auto-detection and co is the same for both methods, so not sharing them would be bad. Deals also with the prevention of side effects triggered by the auto-detection like disabling mounting for the fallback. Git-Dch: Ignore
2014-03-13follow method attribute suggestions by gccDavid Kalnischkies1-1/+1
Git-Dch: Ignore Reported-By: gcc -Wsuggest-attribute={pure,const,noreturn}
2014-03-13cleanup headers and especially #includes everywhereDavid Kalnischkies1-8/+1
Beside being a bit cleaner it hopefully also resolves oddball problems I have with high levels of parallel jobs. Git-Dch: Ignore Reported-By: iwyu (include-what-you-use)
2014-03-13warning: unused parameter ‘foo’ [-Wunused-parameter]David Kalnischkies1-1/+1
Reported-By: gcc -Wunused-parameter Git-Dch: Ignore
2014-03-13warning: no previous declaration for foobar() [-Wmissing-declarations]David Kalnischkies1-4/+4
Git-Dch: Ignore Reported-By: gcc -Wmissing-declarations
2014-03-13warning: extra ‘;’ [-Wpedantic]David Kalnischkies1-13/+13
Git-Dch: Ignore Reported-By: gcc -Wpedantic
2014-02-12apt-cdrom should succeed if any drive succeedsJohn Ogness1-17/+59
If there are multiple CD-ROM drives, `apt-cdrom add` will abort with an error if any of the drives do not contain a Debian CD which is against the documentation we have saying "a CD-ROM" and also scripts do not expect it this way. This patch modifies apt-cdrom to return success if any of the drives succeeded. If failures occur, apt-cdrom will still continue trying all the drives and report the last failure (if none of them succeeded). The 'ident' command was also changed to match the new 'add' behavior. Closes: 728153
2013-08-12squash merge of the feature/apt-binary branch without the changes from ↵Michael Vogt1-20/+10
experimental
2013-08-12improve error messageMichael Vogt1-1/+2
2013-08-08fix -Wall errorsMichael Vogt1-1/+2
2013-07-02fix format string errorMichael Vogt1-2/+2
2013-06-26"mount path"->"mount point" and also make the warning a error when no CD-ROM ↵Michael Vogt1-5/+5
is found
2013-06-22Improve the apt-cdrom output when no CD-ROM can be auto-detectedMichael Vogt1-6/+19
(closes: #712433)
2013-06-20try defaults if auto-detection failed in apt-cdromDavid Kalnischkies1-9/+4
The default is to ask udev for location and mountpoints of CD-ROMs, but the old way of specifying the mountpoint is still available and is tried now in case udev doesn't find any CD-ROM. It probably fails, too, but we get a bunch of error messages this way and the user can get an idea of how to make his setup work even if udev can't be convienced to return something useful. Closes: #712433
2012-03-22the previously used VERSION didn't work everywhere so we are switchingDavid Kalnischkies1-1/+1
to the more standard PACKAGE_VERSION and make it work in every file
2012-03-05fix "(style) The scope of the variable 'count' can be reduced"David Kalnischkies1-4/+3
2011-09-19use forward declaration in headers if possible instead of includesDavid Kalnischkies1-0/+2
2011-09-13reorder includes: add <config.h> if needed and include it at firstDavid Kalnischkies1-4/+4
2010-06-26do not override the user set quiet setting even if the target is not a ttyDavid Kalnischkies1-1/+1
2010-06-25print all messages if the application is in an interactive runDavid Kalnischkies1-7/+5
2010-02-03* cmdline/apt-cdrom.cc:Michael Vogt1-1/+1
- make Acquire::cdrom::AutoDetect default, this can be turned off with "--no-auto-detect"
2010-01-27cmdline/apt-cdrom.cc: add help, fix duplicated optionMichael Vogt1-1/+2
2010-01-26add Dir::Media::MountPath config optionMichael Vogt1-3/+3
2010-01-26* cmdline/apt-cdrom.cc:Michael Vogt1-7/+10
- fixed signed/unsigned warning - create /media mount point if needed - fix initialization for res in DoAdd() * methods/cdrom.cc: - make AptMountPoint a variable
2010-01-26cmdline/apt-cdrom.cc: add --auto-detectMichael Vogt1-3/+64
2009-09-26Fix some typos from #479997bubulle@debian.org1-1/+1
2009-06-30add the various foldmarkers in apt-pkg & cmdline (no code change)David Kalnischkies1-7/+3
2007-08-01* Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrongOtavio Salvador1-2/+2
directory downloading on non-linux architectures (closes: #435597)
2005-10-19apt-cdrom.cc:fix some missing gettext() calls (closes: #334539); ↵Michael Vogt1-3/+3
doc/apt-cache.8.xml: fix typo (closes: #334714)
2005-02-05Merge with Matt and update French translationChristian Perrier1-649/+56
Patches applied: * apt@packages.debian.org/apt--main--0--patch-49 Merge michael.vogt@canonical.com--2004/apt--status-fd--0 * apt@packages.debian.org/apt--main--0--patch-50 Increment libapt-pkg version * apt@packages.debian.org/apt--main--0--patch-51 0.6.30 * apt@packages.debian.org/apt--main--0--patch-52 0.6.31 * apt@packages.debian.org/apt--main--0--patch-53 Remove debugging from apt.cron.daily * apt@packages.debian.org/apt--main--0--patch-54 allow SHA1Summation to process a file descriptor until EOF * apt@packages.debian.org/apt--main--0--patch-55 Fix syntax in sha1.cc * apt@packages.debian.org/apt--main--0--patch-56 Fix build/install of Polish offline documentation * apt@packages.debian.org/apt--main--0--patch-57 Move CD-ROM handling backend into libapt-pkg * apt@packages.debian.org/apt--main--0--patch-58 Fix compilation errors from apt--auth-cdrom--0 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-32 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-1 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-2 * changed version of the library * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-3 * merged with matt again * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-4 * merged with apt--main--0 and fixed permissions in po/ * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-1 tag of michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-4 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-2 * merged with matt's tree * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-3 * removed a stupid "<<<" merge in the changelog * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-4 * star-merged with apt@packages.debian.org/apt--main--0 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-5 * removed the "pre-fork/post-fork" change and put it into it's own branch, star-merged with matt so that it applies cleanly * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-6 * cleaned a incorrect log-file merge * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-7 * removed a conflict in =tagging-method * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-8 * cleaned up the delta so that it no longer contains unreleated whitespace changes * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-51 * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--patch-1 * added support for signed cdroms * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--patch-2 * merged with apt--main, seperated cmdline/apt-cdrom.cc into a library (apt-pkg/cdrom.{cc,h}) * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--patch-3 * cleaned up the cmdline/apt-cdrom.cc code
2005-02-05Fix compilation errors from apt--auth-cdrom--0Matt Zimmerman1-3/+3
2005-02-04Move CD-ROM handling backend into libapt-pkgMatt Zimmerman1-648/+55
- apt-cdrom.cc seperated into frontend (cmdline/apt-cdrom.cc and library apt-pkg/cdrom.{cc,h}) (Ubuntu #5668) Patches applied: * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-51 * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--patch-1 * added support for signed cdroms * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--patch-2 * merged with apt--main, seperated cmdline/apt-cdrom.cc into a library (apt-pkg/cdrom.{cc,h}) * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--patch-3 * cleaned up the cmdline/apt-cdrom.cc code
2005-01-20Correct typo in Usage message : s/arbitary/arbitrary. Unfuzzy translations. ↵Christian Perrier1-1/+1
Closes: #291172 * cmdline/*cc : s/arbitary/arbitrary * po/*po : unfuzzy translations * po/apt-all.pot : updated from source code
2004-09-20* Use isatty rather than ttyname for checking if stdin ...Arch Librarian1-2/+2
Author: mdz Date: 2003-11-19 23:50:51 GMT * Use isatty rather than ttyname for checking if stdin is a terminal. isatty has the advantage of not requiring /proc under Linux, and thus Closes: #221728
2004-09-20* Exclude subdirectories named 'debian-installer' from ...Arch Librarian1-2/+3
Author: mdz Date: 2003-09-12 01:48:33 GMT * Exclude subdirectories named 'debian-installer' from the apt-cdrom search (Closes: #210485)
2004-09-20Change frozen to testing everywhere.Arch Librarian1-3/+3
Author: doogie Date: 2003-04-26 23:26:13 GMT Change frozen to testing everywhere.
2004-09-20Added locale.h for LC_ALLArch Librarian1-1/+2
Author: jgg Date: 2002-02-15 03:40:00 GMT Added locale.h for LC_ALL