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 2009-08-08 11:23:38 -05:00
commit 7bb9c4098b
4 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/libalpm/util.c
View file

@ -509,7 +509,7 @@ int _alpm_run_chroot(const char *root, const char *cmd)
umask(0022); umask(0022);
pipe = popen(cmd, "r"); pipe = popen(cmd, "r");
if(!pipe) { if(!pipe) {
_alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)"), _alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)\n"),
strerror(errno)); strerror(errno));
exit(1); exit(1);
} }
@ -562,7 +562,7 @@ int _alpm_ldconfig(const char *root)
if(access(line, F_OK) == 0) { if(access(line, F_OK) == 0) {
snprintf(line, PATH_MAX, "%ssbin/ldconfig", root); snprintf(line, PATH_MAX, "%ssbin/ldconfig", root);
if(access(line, X_OK) == 0) { if(access(line, X_OK) == 0) {
_alpm_run_chroot(root, "ldconfig"); _alpm_run_chroot(root, "/sbin/ldconfig");
} }
} }

10
scripts/makepkg.sh.in
View file

@ -953,6 +953,9 @@ create_package() {
exit 1 # $E_MISSING_PKGDIR exit 1 # $E_MISSING_PKGDIR
fi fi
cd "$pkgdir"
msg "$(gettext "Creating package...")"
if [ -z "$1" ]; then if [ -z "$1" ]; then
nameofpkg="$pkgname" nameofpkg="$pkgname"
else else
@ -961,9 +964,6 @@ create_package() {
write_pkginfo $nameofpkg write_pkginfo $nameofpkg
cd "$pkgdir"
msg "$(gettext "Creating package...")"
local comp_files=".PKGINFO" local comp_files=".PKGINFO"
# check for an install script # check for an install script
@ -1444,8 +1444,8 @@ fi
ARGLIST=$@ ARGLIST=$@
# Parse Command Line Options. # Parse Command Line Options.
OPT_SHORT="AbcCdefFghiLmop:rRsV" OPT_SHORT="AcCdefFghiLmop:rRsV"
OPT_LONG="allsource,asroot,ignorearch,builddeps,clean,cleancache,nodeps" OPT_LONG="allsource,asroot,ignorearch,clean,cleancache,nodeps"
OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver" OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver"
OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source" OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source"
OPT_LONG="$OPT_LONG,syncdeps,version,config:" OPT_LONG="$OPT_LONG,syncdeps,version,config:"

2
scripts/repo-add.sh.in
View file

@ -301,7 +301,7 @@ check_repo_db()
CLEAN_LOCK=1 CLEAN_LOCK=1
else else
error "$(gettext "Failed to acquire lockfile: %s.")" "$LOCKFILE" error "$(gettext "Failed to acquire lockfile: %s.")" "$LOCKFILE"
[ -f "$LOCKFILE" ] && error "$(gettext "Held by %s")" "$(cat $LOCKFILE)" [ -f "$LOCKFILE" ] && error "$(gettext "Held by process %s")" "$(cat $LOCKFILE)"
exit 1 exit 1
fi fi

26
src/pacman/sync.c
View file

@ -837,18 +837,26 @@ int pacman_sync(alpm_list_t *targets)
/* check for newer versions of packages to be upgraded first */ /* check for newer versions of packages to be upgraded first */
alpm_list_t *packages = syncfirst(); alpm_list_t *packages = syncfirst();
if(packages) { if(packages) {
printf(_(":: The following packages should be upgraded first :\n")); /* Do not ask user if all the -S targets are SyncFirst packages, see FS#15810 */
list_display(" ", packages); alpm_list_t *tmp = NULL;
if(yesno(_(":: Do you want to cancel the current operation\n" if(config->op_s_upgrade || (tmp = alpm_list_diff(targets, packages, (alpm_list_fn_cmp)strcmp))) {
":: and upgrade these packages now?"))) { alpm_list_free(tmp);
FREELIST(targs); printf(_(":: The following packages should be upgraded first :\n"));
targs = packages; list_display(" ", packages);
config->flags = 0; if(yesno(_(":: Do you want to cancel the current operation\n"
config->op_s_upgrade = 0; ":: and upgrade these packages now?"))) {
FREELIST(targs);
targs = packages;
config->flags = 0;
config->op_s_upgrade = 0;
} else {
FREELIST(packages);
}
printf("\n");
} else { } else {
pm_printf(PM_LOG_DEBUG, "skipping SyncFirst dialog\n");
FREELIST(packages); FREELIST(packages);
} }
printf("\n");
} }
} }