Age | Commit message (Collapse) | Author | Files | Lines |
|
No real reason, this is just easier to understand, and checks
like this should be the norm.
If file does not exist, continue
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Removed the need for makepkg.conf
* Killed off CARCH
* Added PKGEXT to the config file
* Remove source_makepkg function
* Source config file where makepkg.conf was needed
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
DBEXT contains the full extension for the db files (.db.tar.gz)
and is recorded in the config file
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
|
|
|
|
If no packages are present in the repository, a message like this will be generated, and the corresponding mv command will be issued.
Prevent this by checking if *$arch$PKGEXT equals "*$arch$PKGEXT":
Scan complete for core (i686) at /srv/ftp/core/os/i686
The following files are in the repo but not the db
They will be moved to '/srv/package-cleanup'
*i686.pkg.tar.gz
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
community repo is cleaned up on a different machine
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Remove the hardcoded i686/x86_64 and loop over the ARCHES
array in the config file, checking for valid symlinks.
If none are found, remove the 'any' package
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Clean up some output so when we do nothing, we get no output
This is preferred as the mailer will simply not send a mail
in this case.
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Source our config file, and use ARCHES from it
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
[Aaron: keep WORKDIR creation outside the loop, as its
removed at the end]
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
|
|
Because we lock/unlock in a loop, simply remove the cleanup trap
at the end of the process, and manually clean up the work dir
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
All split packages are treated as unit and can only be moved together. For split
packages the pkgbase value has to be used to find the corresponding entry in the
svn repository. Note: different architecures (e.g. any) is not supported by
makepkg.
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
This may look like a rather large patch, but the changes are mostly a
reshuffling of the code to loop over all arches first, and then handle
the arch-indep packages. The cronjob has been changed accordingly.
Added new category DELETESYMLINKS, which are deleted instead of being
moved to package-cleanup. I have also fixed the arch-specific issue
with the ftppath, using parameters in config instead.
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Failed hard on empty 'any' directories
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
These are handled automatically when scanning other architecutres
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Previous logic was stupid... let's just check the missing files.
If it's missing and exists in the any dir, then common sense says
we deleted a symlink somewhere...
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
* Break out ftppath, base it on ftbpath_base
* Only check ARCHINDEPFILES if the any dir exists
* Attempt to restore symlinks before moving 'any' files out of the way
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Check for pkgbase first. If and only if this doesn't exist,
return pkgname. This fixes potential ordering issues.
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
* also added error msg for repo_lock in db-functions
[Aaron: keep quotes around $WORKDIR]
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
[Aaron: Don't remove quotes around $WORKDIR]
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
* When calling cleanup at the end of db-update, the function
repo_unlock is called, but the repo-locks have already been unlocked!
So we get a spurious error message. This commit replaces "cleanup" by
"rm -rf $WORKDIR".
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
* undefined argument $pattern changed to $2
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
3rd argument to the script
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
This is useful when running on separate machines that don't
have all repos
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
This is just for readability and cleanup
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Prefer pkgbase over pkgname in getpkgbase()
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
* don't add files with arch=any to EXTRAFILES
* replace && by -a within [ ]
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|