summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* query_fileowner: remove assumption that root is "/"Andrew Gregory2012-09-18
| | | | | | | | Returning "/" from mdirname removes it as a special case which allows us to test it like any other directory. This corrects a false positive when querying a file in / and root is not set to /. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
* query_fileowner: remove trailing '/' from targetsAndrew Gregory2012-09-18
| | | | | | | | Trailing '/' in paths causes lstat to dereference symlinks to directories which causes it to break even though the symlink is a valid target. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
* query_fileowner: resolve root earlyAndrew Gregory2012-09-18
| | | | | | | | Resolving root early prevents later calls to realpath from having to do the work of actually resolving any symlinks in root. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* query_fileowner: remove resolve_path functionAndrew Gregory2012-09-18
| | | | | | | | resolve_path is a equivalent to calling realpath(path, NULL) except that the returned string is guaranteed to be PATH_MAX long. We never append to the returned string, so this is unnecessary. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
* query_fileowner: break/continue pkgfile loopAndrew Gregory2012-09-18
| | | | | | | Break out of pkgfile loop on match or continue if the pkgfile path is too long. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
* Move important information up in -Si outputAllan McRae2012-08-07
| | | | | | | | | Currently, the package description is printed at the end of the -Si output. This is probably one of the more important pieces of information so should be nearer the top. Also move the package architecture up. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* PKGBUILD.vim: improve 'options' highlighting, add extra keywordsJason St. John2012-08-07
| | | | | | | | | | | | | This fixes the current syntax highlighting behavior in the 'options' array, which does *not* flag illegal options (e.g. typos, unsupported options). The shDoubleQuote and shSingleQuote options were the culprits. Now, if you enter `'!imptydurs'`, the typoed option will be flagged red. I also added syntax highlighting for the new options listed in `man 5 makepkg.conf`, which I believe were introduced around pacman 4.0.0. Signed-off-by: Jason St. John <jstjohn@purdue.edu> Signed-off-by: Dan McGee <dan@archlinux.org>
* removed the condition in alpm_db_set_servers since FREELIST is NULL safeBarbu Paul - Gheorghe2012-08-07
| | | | | Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* added coding standardBarbu Paul - Gheorghe2012-08-07
| | | | Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe@gmail.com>
* fixed typoBarbu Paul - Gheorghe2012-08-07
| | | | Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe@gmail.com>
* Merge remote-tracking branch 'allan/working-split/vcs'Dan McGee2012-08-07
|\
| * makepkg: delay checking for build package with pkgver()Allan McRae2012-08-04
| | | | | | | | | | | | | | If a pkgver() function is specified, delay checking the package is built until the pkgver is updated.. Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: add hg url supportAllan McRae2012-08-04
| | | | | | | | | | | | Supported fragments are branch, revision and tag. Signed-off-by: Allan McRae <allan@archlinux.org>
| * doc: Add --holdver information for makepkgAllan McRae2012-08-04
| | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * doc: Document using svn source urlAllan McRae2012-08-04
| | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * doc: document automatically updating the pkgver variableAllan McRae2012-08-04
| | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * doc: Document using VCS sources in a PKGBUILDAllan McRae2012-08-04
| | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: check pkgver validity after updatingAllan McRae2012-08-04
| | | | | | | | | | | | | | If a PKGBUILD has a pkgver() function, skip checking the pkgver validity until it has been updated. Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: only update pkgver when all sources are availableAllan McRae2012-08-04
| | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: add --holdver to control VCS source updatingAllan McRae2012-08-04
| | | | | | | | | | | | | | Do not update VCS sources if --holdver is used. If the VCS checkout is not present, it will still be downloaded. Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: do not download VCS sources unless neededAllan McRae2012-08-04
| | | | | | | | | | | | | | | | VCS sources are not needed for --geninteg or --source operations. This also prevents VCS downloads outputting to stdout, which prevented piping -g output to the PKGBUILD. Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: rename myverAllan McRae2012-08-04
| | | | | | | | | | | | myver is a bit generic for an internal variable name. Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: add support for SVN urlsAllan McRae2012-08-04
| | | | | | | | | | | | | | | | | | | | | | Allow SVN repo sources in the form: source=("<folder>::<repo>#<fragment>") where <repo> must start with svn (e.g svn+http://) and a <fragment> can specify a revision (e.g. revision=22). Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: provide mechanism for auto-updating pkgverAllan McRae2012-08-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that VCS repos are provided in the source array, it becomes too complicated to have automatic updating pkgver as was the case with the old VCS PKGBUILDs (there can be multiple repos of different types in the source array, the VCS repo may not be the package primary source, etc). Instead provide an optional way for a PKGBUILD to update the pkgver value through the specifing of a pkgver() function that returns the new version string. This is run after all source files are downloaded so can access the VCS repo if needed. Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: modify get_filepath to handle VCS sourcesAllan McRae2012-08-04
| | | | | | | | | | | | | | | | With VCS sources, get_filepath should return the directory of the checkout. This allows backing up of the VCS checkout when using --allsource. Fixes FS#21098. Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: modify get_filename to handle VCS sourcesAllan McRae2012-08-04
| | | | | | | | | | | | | | Modify get_filename to return the name of the folder with VCS sources. This fixes output issues in checksum checking. Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: fix checksum generation with VCS sourcesAllan McRae2012-08-04
| | | | | | | | | | | | VCS sources should have "SKIP" for their checksum value Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: allow using GIT source URLsAllan McRae2012-08-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow specifing GIT sources using the following syntax source=('<folder>::<repo>#<fragment>') This will download the git repo <repo> into <folder> (into $SRCDIR if set, otherwise $startdir). <repo> must start with "git", but non-git protocols are handled using (e.g.) "git+http://...". The <fragment> can be used to specify a branch, tag, or commit to build from. e.g. branch=maint. Checksum entries for git sources should be "SKIP". Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: skip integrity checking earlyAllan McRae2012-08-04
| | | | | | | | | | | | | | | | | | If "SKIP" is provided for an integrity check, abort checking as soon as possible. Also swap fork to tr for bash4 conversion. Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: generalize download_sourcesAllan McRae2012-08-04
| | | | | | | | | | | | | | | | | | | | | | In order to treat all VCS sources as URLs, we need to be able to deal with more protocols. Rewrite download_sources to use a case statement so additional protocols are easily added. Also fix the use of scp to not pass the protocol in the URL (noticed by William J. Bowman <wjb@williamjbowman.com>) Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: add function to return download protocolAllan McRae2012-08-04
| | | | | | | | | | | | | | Extract the download protocol from a source entry. Returns "local" for local source files. Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: reorder source handling functionsAllan McRae2012-08-04
| | | | | | | | | | | | | | There is no actual code change here, but these related functions were all over the place which makes this code difficult to adjust. Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: remove VCS package supportAllan McRae2012-08-04
| | | | | | | | | | | | | | The current VCS packaging support is really, really, really bad. It is best to strip it out completely before rewriting it. Signed-off-by: Allan McRae <allan@archlinux.org>
* | Merge branch 'maint'Dan McGee2012-08-07
|\ \
| * | Print repo being search for replaces in debug outputAllan McRae2012-08-07
| | | | | | | | | | | | | | | | | | | | | | | | Given the message is repeated for each repo, it is a good idea to print the repo name in the output. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | | coding style fixesFlorian Pritz2012-08-07
| |/ |/| | | | | | | Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Dan McGee <dan@archlinux.org>
* | pacman-key: Use lsign_keys function in --populatePierre Schmitz2012-08-02
| | | | | | | | | | | | This reduces code duplication and also makes --populate a non-interactive function. Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
* | Split _alpm_filelist_operation functionAllan McRae2012-08-02
| | | | | | | | | | | | | | | | | | To improve conflict checking, we will need to make these functions diverge to an extent where having two separate functions will be preferable. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Move filelist functions into separate source fileDan McGee2012-08-02
| | | | | | | | | | | | | | | | | | We have a few of these and might as well gather them together. This also cleans up the code a bit by using an enum instead of integer values, as well as makes a "search for file in filelist" function public so frontends can do better than straight linear search of the filelists. Signed-off-by: Dan McGee <dan@archlinux.org>
* | pactest: avoid upgrade conflict with unchanged effective pathDave Reisner2012-08-02
| | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | pactest: Do not remove symlink to directory if a to be installed package uses itAllan McRae2012-08-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a pacakge has a directory symlink (e.g. /lib -> usr/lib), do not allow it to be removed if any other package is trying to install a file into that path (e.g. /lib/foo). This is because the local database can become invalidated if the symlink is removed after the package with file /lib/foo is installed (sync702.py). If the symlink is removed before the file is installed (sync701.py), the upgrade is actually a success, but we can not guarantee the ordering so both cases should fail. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | pactest: Do not remove symlink to directory if local package uses that pathAllan McRae2012-08-02
| | | | | | | | | | | | | | | | | | | | If we have a symlink to a directory (e.g. /lib -> usr/lib), then we can not remove it if a local package thinks it has files in the symlink directory (e.g. /lib/foo), because this will invalidate the local file database. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | pactest: conflict between files having same effective pathAllan McRae2012-08-02
| | | | | | | | | | | | | | | | Note failure to detect a conflict between files having the same effective path across packages due to a directory symlink. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | pactest: conflict between directory and a fileAllan McRae2012-08-02
| | | | | | | | | | | | | | | | | | Note failure to detect a conflict between a directory in one package and a file in the other when the directory is not currently on the filesystem. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Add pactest for empty subdirectory conflictAllan McRae2012-08-02
| | | | | | | | | | | | | | | | The wrong test file was inadvertantly committed in 44e9fdd0. Add the correct test and tidy up the test which was committed. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Allow cleaning only some cachedirsJan Alexander Steffens (heftig)2012-08-02
| | | | | | | | | | | | | | | | | | | | When cleaning the cache, ask for each cachedir separately. Allan: add some white space in output Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Merge branch 'maint'Dan McGee2012-08-01
|\|
| * makepkg: remove unnecessary formattingAllan McRae2012-08-01
| | | | | | | | | | | | | | | | This extra newline leaves a gap that looks strange in of itself, but is highlighted when piping -g output to a PKGBUILD. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
| * contrib/bacman: fix package architecture in filenameAllan McRae2012-08-01
| | | | | | | | | | | | | | | | | | | | Give the generated package the correct architecture in its filename rather than assuming the system architecture. Also add updated copyright notice. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
| * Add more debug logging to dir_belongsto_pkg() functionDan McGee2012-08-01
| | | | | | | | | | | | Now that we pass in the handle, we might as well add logging. Signed-off-by: Dan McGee <dan@archlinux.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 17:48:10 +0000