emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

alternatives: fix creation of symlinks with unexistent dirs.

Browse Source 
If an alternative needs to create /usr/bin/foo, and /usr/bin
does not exist, this directory must be created prior to create
the symlink.
This commit is contained in:
Juan RP 2015-11-14 07:26:27 +01:00
parent e0ce5641a3
commit b3c7d27c6b
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/package_alternatives.c
View File

@ -150,7 +150,7 @@ create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname)
cnt = xbps_array_count(a); cnt = xbps_array_count(a);
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
xbps_string_t str; xbps_string_t str;
char *tgt_dup, *tgt_dir; char *tgt_dup, *tgt_dir, *lnk_dup, *lnk_dir;
char *l, *lnk, *tgt = NULL; char *l, *lnk, *tgt = NULL;
const char *tgt0; const char *tgt0;
int rv; int rv;
@ -171,12 +171,34 @@ create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname)
xbps_dbg_printf(xhp, "failed to create symlink" xbps_dbg_printf(xhp, "failed to create symlink"
"target dir '%s' for group '%s': %s\n", "target dir '%s' for group '%s': %s\n",
tgt, grname, strerror(errno)); tgt, grname, strerror(errno));
free(tgt_dup);
free(tgt); free(tgt);
free(l); free(l);
return rv; return rv;
} }
} }
free(tgt); free(tgt);
/* always create link dir, for dangling symlinks */
lnk_dup = strdup(l);
assert(lnk_dup);
lnk_dir = dirname(lnk_dup);
lnk = xbps_xasprintf("%s%s", xhp->rootdir, lnk_dir);
if (xbps_mkpath(lnk, 0755) != 0) {
if (errno != EEXIST) {
rv = errno;
xbps_dbg_printf(xhp, "failed to create symlink"
"dir '%s' for group '%s': %s\n",
lnk, grname, strerror(errno));
free(tgt_dup);
free(tgt);
free(lnk_dup);
free(lnk);
free(l);
return rv;
}
}
free(lnk);
free(lnk_dup);
if (l[0] != '/') { if (l[0] != '/') {
lnk = xbps_xasprintf("%s%s/%s", xhp->rootdir, tgt_dir, l); lnk = xbps_xasprintf("%s%s/%s", xhp->rootdir, tgt_dir, l);

8
tests/xbps/xbps-alternatives/main.sh
View File

@ -36,7 +36,7 @@ register_one_dangling_head() {
register_one_dangling_body() { register_one_dangling_body() {
mkdir -p repo pkg_A/usr/bin mkdir -p repo pkg_A/usr/bin
cd repo cd repo
xbps-create -A noarch -n A-1.1_1 -s "A pkg" --alternatives "file:/usr/bin/file:/usr/bin/fileA file2:file2:/usr/include/fileB" ../pkg_A xbps-create -A noarch -n A-1.1_1 -s "A pkg" --alternatives "file:/usr/bin/file:/usr/bin/fileA file2:/usr/lib/fileB:/usr/include/fileB" ../pkg_A
atf_check_equal $? 0 atf_check_equal $? 0
xbps-rindex -d -a $PWD/*.xbps xbps-rindex -d -a $PWD/*.xbps
atf_check_equal $? 0 atf_check_equal $? 0
@ -54,9 +54,9 @@ register_one_dangling_body() {
fi fi
atf_check_equal $rv 0 atf_check_equal $rv 0
rv=1 rv=1
if [ -h root/usr/include/file2 ]; then if [ -h root/usr/lib/fileB ]; then
lnk=$(readlink root/usr/include/file2) lnk=$(readlink -f root/usr/lib/fileB)
if [ "$lnk" = "fileB" ]; then if [ "$lnk" = "$PWD/root/usr/include/fileB" ]; then
rv=0 rv=0
fi fi
echo "A lnk: $lnk" echo "A lnk: $lnk"