mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
Merge branch 'maint'
This commit is contained in:
commit
9fbb77c91b
@ -73,7 +73,7 @@ Options
|
||||
default to the current directory. This allows the built package to be
|
||||
overwritten.
|
||||
|
||||
*-forcever*::
|
||||
*--forcever*::
|
||||
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
|
||||
set the new development pkgver of the package.
|
||||
|
@ -1007,7 +1007,7 @@ devel_check() {
|
||||
newpkgver=$(date +%Y%m%d)
|
||||
elif [ ! -z ${_svntrunk} ] && [ ! -z ${_svnmod} ] ; then
|
||||
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
|
||||
msg "$(gettext "Determining latest bzr revision...")"
|
||||
newpkgver=$(bzr revno ${_bzrtrunk})
|
||||
|
@ -526,12 +526,9 @@ static int sync_trans(alpm_list_t *targets, int sync_only)
|
||||
* an '-S pacman' operation */
|
||||
if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0) {
|
||||
printf("\n");
|
||||
printf(_(":: pacman has detected a newer version of itself.\n"
|
||||
":: It is recommended that you upgrade pacman by itself\n"
|
||||
":: using 'pacman -S pacman', and then rerun the current\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] "))) {
|
||||
printf(_(":: pacman has detected a newer version of itself.\n"));
|
||||
if(yesno(_(":: Do you want to cancel the current operation\n"
|
||||
":: and install the new pacman version now? [Y/n] "))) {
|
||||
if(alpm_trans_release() == -1) {
|
||||
fprintf(stderr, _("error: failed to release transaction (%s)\n"),
|
||||
alpm_strerrorlast());
|
||||
|
Loading…
Reference in New Issue
Block a user