summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* scripts: refactor output formatting functionsAllan McRae2011-06-15
| | | | | | | | | Move the common output formatting functions into a separate library file and import that into each script. makepkg is excluded due to its additional color formatting. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* makepkg: move option parsing code to separate fileAllan McRae2011-06-15
| | | | | | | | | | | | This move the getopt replacement function parse_options out of makepkg.sh.in and into a separate file. The code is inserted into the relevant place in makepkg using m4. This will allow the reuse of the option parsing code in other scripts (i.e. pacman-key) while avoiding code duplication. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* Merge branch 'maint'Dan McGee2011-06-15
|\
| * list_display: fix incorrect assignmentDan McGee2011-06-15
| | | | | | | | | | | | | | Commit 895a88886525d erroneously left this around. Noticed-by: Jakob Gruber <jakob.gruber@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
| * Fix man page generation for out of tree buildAllan McRae2011-06-15
| | | | | | | | | | | | | | | | Fix failure at man page generation when building outside the source tree. There may still be issues with other documentation types... Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Ensure humanize_size works for negative valuesJakob Gruber2011-06-15
| | | | | | | | | | Signed-off-by: Jakob Gruber <jakob.gruber@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Use pm_fprintpf in table_create_formatJakob Gruber2011-06-15
| | | | | | | | | | Signed-off-by: Jakob Gruber <jakob.gruber@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg: reword purge messageAllan McRae2011-06-15
| | | | | | | | | | | | | | | | Clarfiy that it is unwanted files are being removed rather than "other" files (whatever they are...). Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | valgrind.supp: add known leak exposed by cURLDan McGee2011-06-14
| | | | | | | | | | | | This one comes courtesy of OpenSSL and some static initialization. Signed-off-by: Dan McGee <dan@archlinux.org>
* | doc/PKGBUILD: misc changesFlorian Pritz2011-06-14
| | | | | | | | | | Acked-by: matt mooney <mfm@muteddisk.com> Signed-off-by: Florian Pritz <bluewind@xinu.at>
* | Rename and rework signing helper methodsDan McGee2011-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | * Don't name static methods with a gpgme_ prefix to avoid confusion with methods provided by the library. These are static and local to our file so just give them sane non-prefixed names. * Rework sigsum_test_bit() to not require assignment. * Don't balk if there is more than one signature available (for now, only check the first). * Fix error codes in publicly visible methods to return -1, not 0, if pkg or db are not provided. Signed-off-by: Dan McGee <dan@archlinux.org>
* | Alpm pkg accessors: ensure pkg argument is non-NULLDan McGee2011-06-14
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | Ensure handle is valid and pm_errno is reset when calling into APIDan McGee2011-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We didn't do due diligence before and ensure prior pm_errno values weren't influencing what happened in further ALPM calls. I observed one case of early setup code setting pm_errno to PM_ERR_WRONG_ARGS and that flag persisting the entire time we were calling library code. Add a new CHECK_HANDLE() macro that does two things: 1) ensures the handle variable passed to it is non-NULL and 2) clears any existing pm_errno flag set on the handle. This macro can replace many places we used the ASSERT(handle != NULL, ...) pattern before. Several other other places only need a simple 'set to zero' of the pm_errno field. Signed-off-by: Dan McGee <dan@archlinux.org>
* | Avoid setting sigverify option twiceDan McGee2011-06-14
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | Conflict check and skip_remove code cleanupsDan McGee2011-06-14
| | | | | | | | | | | | | | | | | | | | * Move several variables into better scope * const-ify a few variables * Avoid duplicating filelists if it is unnecessary * Better handling out out of memory condition when adding file conflicts to our list Signed-off-by: Dan McGee <dan@archlinux.org>
* | Small handle related cleanupsDan McGee2011-06-14
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | Add handle argument to _alpm_pkg_should_ignore()Dan McGee2011-06-14
| | | | | | | | | | | | | | This allows callers to retrieve it from wherever is convenient, which may or may not be on the package object itself. Signed-off-by: Dan McGee <dan@archlinux.org>
* | Merge remote-tracking branch 'florian/sodeps'Dan McGee2011-06-14
|\ \
| * | doc/PKGBUILD: document libdepsFlorian Pritz2011-06-09
| | | | | | | | | | | | Signed-off-by: Florian Pritz <bluewind@xinu.at>
| * | makepkg: add libdepends supportFlorian Pritz2011-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user adds libaries to the depends array without a version. These must end with .so. Example: depends=(glibc libc.so) find_libdepends() looks for ELF files (not symlinks because these could point outside of pkgdir) in $pkgdir, extracts the library sonames the binary links to and outputs depends seperated by spaces. This list contains all libraries needed by the package. Example: libfoo.so=3-64 write_pkginfo() only keeps .so depends with version information and warns the user about unneded ones. Support-by: Thomas Bächler <thomas@archlinux.org> Support-by: Christoph Schied <Christoph.Schied@uni-ulm.de> Signed-off-by: Florian Pritz <bluewind@server-speed.net>
| * | makepkg: add libprovides supportFlorian Pritz2011-05-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user adds libaries to the provides array without a version. These must end with .so. Example: provides=(readline libreadline.so) find_libprovides() looks for .so files (not symlinks because these could point outside of pkgdir) in $pkgdir, extracts the library soname (ld links the binary to this name) and outputs provides seperated by spaces. This list contains all libraries provided by the package. Example: libfoo.so=3-64 write_pkginfo() only keeps .so provides with version information and warns the user about unneded ones. Support-by: Thomas Bächler <thomas@archlinux.org> Support-by: Christoph Schied <Christoph.Schied@uni-ulm.de> Signed-off-by: Florian Pritz <bluewind@server-speed.net>
* | | doc/PKGBUILD: misc changesFlorian Pritz2011-06-14
| | | | | | | | | | | | | | | Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Merge branch 'maint'Dan McGee2011-06-14
|\ \ \ | | |/ | |/| | | | | | | Conflicts: doc/makepkg.conf.5.txt
| * | Added check option to BUILDENV array in makepkg.conf man pageEric Bélanger2011-06-13
| | | | | | | | | | | | | | | Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
| * | Fix list_display on non-ttys and other output fixesDan McGee2011-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit c1f742d7750a14 broke what was one of the tenants of out output- if piping pacman output somewhere else, we shouldn't ever try to line-wrap and indent print our output. This makes it easier for tools to use output from pacman -Ss, -Qs, -Qi, etc. list_display() unfortunately was given a default value of 80 rather than 0, so fix this. Next, make some additional changes that ensure we don't insert an unnecessary blank line if for some crazy reason the indent level (such as on -Qi output) is greater than the number of columns. Accomplish this by printing the first item unconditionally as we do in list_display_linebreak(). Finally, teach indentprint to not wrap if the number of columns is less than the indent level, this prevents some forms of ridiculous output such as the following: Install Date : Wed 08 Jun 2011 04:39:19 AM CDT Signed-off-by: Dan McGee <dan@archlinux.org>
| * | Add late-breaking 3.5.3 NEWSDan McGee2011-06-07
| | | | | | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Remove alpm_db_get_url()Dan McGee2011-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | This method is old, it doesn't adequately check for a NULL server list, and can easily be done using better API method we provide these days. All former users of this method can get similar results by calling alpm_db_get_servers() and using the data from the returned server list. Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Add a helper method for retrieving the DB signature pathDan McGee2011-06-13
| | | | | | | | | | | | | | | | | | | | | Note that is a bit different than the normal _alpm_db_path() method; the caller is expected to free the result. Signed-off-by: Dan McGee <dan@archlinux.org>
* | | alpm_db_update(): refactor out sync dir create/checkDan McGee2011-06-13
| | | | | | | | | | | | | | | | | | This was a lot of stuff that can stand by itself for the most part. Signed-off-by: Dan McGee <dan@archlinux.org>
* | | conf: do batch processing of repo sectionsDan McGee2011-06-13
| | | | | | | | | | | | | | | | | | | | | | | | We now parse an entire repo section and store all information about it. When the next section is encountered or the end of the root config file is reached, we will then process the stored information. Signed-off-by: Dan McGee <dan@archlinux.org>
* | | conf: _parseconfig() cleanups and documentationDan McGee2011-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Function doxygen documentation * Reuse a single strlen() call * Prevent infinite recursion (limit to 10 levels) * Other small cleanups Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Always pass data to trans_commit()Dan McGee2011-06-13
| | | | | | | | | | | | | | | | | | | | | Even though we currently don't use it here in the backend, we might as well pass it in since we used it earlier. Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Remove global handle variableDan McGee2011-06-13
| | | | | | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Switch all logging to use handle directlyDan McGee2011-06-13
| | | | | | | | | | | | | | | | | | | | | This is the last user of our global handle object. Once again the diff is large but the functional changes are not. Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Move pm_errno onto the handleDan McGee2011-06-13
| | | | | | | | | | | | | | | | | | This involves some serious changes and a very messy diff, unfortunately. Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Add handle argument to two more alpm methodsDan McGee2011-06-13
| | | | | | | | | | | | | | | | | | This takes care of alpm_checkdeps() and alpm_find_dbs_satisfier(). Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Require handle for alpm_checkconflicts()Dan McGee2011-06-13
| | | | | | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Require handle for alpm_pkg_load()Dan McGee2011-06-13
| | | | | | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Add handle argument to alpm_(add|remove)_pkg()Dan McGee2011-06-13
| | | | | | | | | | | | | | | | | | | | | | | | This makes these functions consistent with the rest of the transaction related API calls. We do an additional assert to ensure the handle attached to the package is the same as the handle passed in. Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Added initialization code for database siglevelKerrick Staley2011-06-13
| | | | | | | | | | | | | | | | | | | | | | | | The siglevel field of a newly created pmdb_t struct is now initialized when it is created in _alpm_db_new(). Signed-off-by: Kerrick Staley <mail@kerrickstaley.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Fix memory leak if package sig was invalidDan McGee2011-06-13
| | | | | | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Fix all current return(x) usagesDan McGee2011-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | A few of these snuck in as of late, some from the table display patches that were using the previous format before we changed it after the 3.5.X major release. Noticed-by: Kerrick Staley <mail@kerrickstaley.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | | commit_single_pkg(): Use handle object directlyDan McGee2011-06-09
| | | | | | | | | | | | | | | | | | | | | | | | Commit e68f5d9a3067141 did something a bit silly and changed the scriptlet calls to use 'newpkg->handle' rather than the 'handle' argument passed in. Use the handle directly. Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Require handle for alpm_sync_sysupgrade()Dan McGee2011-06-09
| | | | | | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Require handle for alpm_db_register_sync()Dan McGee2011-06-09
| | | | | | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Require handle argument to all alpm_trans_*() methodsDan McGee2011-06-09
| | | | | | | | | | | | | | | | | | | | | Begin enforcing the need to pass a handle. This allows us to remove one more extern handle declaration from the backend. Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Require handle argument to all alpm_option_(get|set)_*() methodsDan McGee2011-06-09
| | | | | | | | | | | | | | | | | | | | | | | | This requires a lot of line changes, but not many functional changes as more often than not our handle variable is already available in some fashion. Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Require handle argument to alpm_logaction()Dan McGee2011-06-09
| | | | | | | | | | | | | | | | | | | | | This is the first in a series of patches to update the API to remove the implicit global handle variable. Signed-off-by: Dan McGee <dan@archlinux.org>
* | | Kill all remaining 'PATH_MAX + 1' usagesDan McGee2011-06-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | The few remaining instances were utilized for buffers in calls to snprintf() and realpath(). Both of these functions will always ensure the returned value is padded with '\0', so there is no need for the extra byte. Signed-off-by: Dan McGee <dan@archlinux.org>
* | | _alpm_lstat: only duplicate string if necessaryDan McGee2011-06-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | The vast majority of the time we will just be passing the same string value on to the lstat() call. The only time we need to duplicate it is if the path ends in '/'. In one run using a profiler, only 400 of the 200,000 calls (0.2%) required the string to be copied first. Signed-off-by: Dan McGee <dan@archlinux.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:36:16 +0000