bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source
This commit is contained in:
Dan McGee 2008-01-27 11:54:52 -06:00
commit 9fbb77c91b
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/makepkg.8.txt
View file

@ -73,7 +73,7 @@ Options
default to the current directory. This allows the built package to be default to the current directory. This allows the built package to be
overwritten. overwritten.
*-forcever*:: *--forcever*::
This is a hidden option that should *not* be used unless you really know This is a hidden option that should *not* be used unless you really know
what you are doing. makepkg uses this internally when calling itself to what you are doing. makepkg uses this internally when calling itself to
set the new development pkgver of the package. set the new development pkgver of the package.

2
scripts/makepkg.sh.in
View file

@ -1007,7 +1007,7 @@ devel_check() {
newpkgver=$(date +%Y%m%d) newpkgver=$(date +%Y%m%d)
elif [ ! -z ${_svntrunk} ] && [ ! -z ${_svnmod} ] ; then elif [ ! -z ${_svntrunk} ] && [ ! -z ${_svnmod} ] ; then
msg "$(gettext "Determining latest svn revision...")" msg "$(gettext "Determining latest svn revision...")"
newpkgver=$(svn log $_svntrunk --limit 1 | sed -n 's/^r\([^ ]*\) .*$/\1/p') newpkgver=$(svn log $_svntrunk --limit 1 -q | sed -n 's/^r\([0-9]*\) .*$/\1/p')
elif [ ! -z ${_bzrtrunk} ] && [ ! -z ${_bzrmod} ] ; then elif [ ! -z ${_bzrtrunk} ] && [ ! -z ${_bzrmod} ] ; then
msg "$(gettext "Determining latest bzr revision...")" msg "$(gettext "Determining latest bzr revision...")"
newpkgver=$(bzr revno ${_bzrtrunk}) newpkgver=$(bzr revno ${_bzrtrunk})

9
src/pacman/sync.c
View file

@ -526,12 +526,9 @@ static int sync_trans(alpm_list_t *targets, int sync_only)
* an '-S pacman' operation */ * an '-S pacman' operation */
if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0) { if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0) {
printf("\n"); printf("\n");
printf(_(":: pacman has detected a newer version of itself.\n" printf(_(":: pacman has detected a newer version of itself.\n"));
":: It is recommended that you upgrade pacman by itself\n" if(yesno(_(":: Do you want to cancel the current operation\n"
":: using 'pacman -S pacman', and then rerun the current\n" ":: and install the new pacman version now? [Y/n] "))) {
":: operation. If you wish to continue the operation and\n"
":: not upgrade pacman separately, answer no.\n"));
if(yesno(_(":: Cancel current operation? [Y/n] "))) {
if(alpm_trans_release() == -1) { if(alpm_trans_release() == -1) {
fprintf(stderr, _("error: failed to release transaction (%s)\n"), fprintf(stderr, _("error: failed to release transaction (%s)\n"),
alpm_strerrorlast()); alpm_strerrorlast());