Attachment #199450 for bug #266646

View | Details | Raw Unified | Return to bug 266646
Collapse All | Expand All

Lines 91-98 Link Here

(-)portage-utils.orig/libq/atom_explode.c (-2 / +1 lines)
91	if (ptr[0] == 'r' && ptr[-1] == '-') {	91	if (ptr[0] == 'r' && ptr[-1] == '-') {
92	ret->PR_int = atoi(ptr + 1);	92	ret->PR_int = atoi(ptr + 1);
93	ptr[-1] = '\0';	93	ptr[-1] = '\0';
94	} else	94	}
95	strcat(ret->PVR, "-r0");
96	break;	95	break;
97	}	96	}
98	--ptr;	97	--ptr;




	struct stat st;

	if (pretend) {
		printf(" %s-%s %s/%s:\n", GREEN, NORM, atom->CATEGORY, atom->PVR);
		return 0;
	}

	snprintf(buf, sizeof(buf), "%s/%s/%s/CONTENTS", portvdb, atom->CATEGORY, atom->PVR);
	if ((fp = fopen(buf, "r")) == NULL)
		return -1;


	fclose(out);
	fclose(fp);

	printf(" %s-%s %s/%s: ", GREEN, NORM, atom->CATEGORY, atom->PVR);
	fflush(stdout);

	snprintf(tbz2, sizeof(tbz2), "%s/bin.tar.bz2", tmpdir);

	pclose(fp);

	snprintf(xpak, sizeof(xpak), "%s/inf.xpak", tmpdir);
	snprintf(buf, sizeof(buf), "%s/%s/%s", portvdb, atom->CATEGORY, atom->PVR);
	xpak_argv[0] = buf;
	xpak_argv[1] = NULL;
	xpak_create(xpak, 1, xpak_argv);

	unlink(xpak);
	unlink(tbz2);

	snprintf(tbz2, sizeof(tbz2), "%s/%s.tbz2", qpkg_get_bindir(), atom->PVR);
	if (rename(buf, tbz2)) {
		warnp("could not move '%s' to '%s'", buf, tbz2);
		return 1;

Return to bug 266646

Lines 206-216 Link Here

(-)portage-utils.orig/qpkg.c (-5 / +5 lines)
206	struct stat st;	206	struct stat st;
207		207
208	if (pretend) {	208	if (pretend) {
209	printf(" %s-%s %s/%s:\n", GREEN, NORM, atom->CATEGORY, atom->P);	209	printf(" %s-%s %s/%s:\n", GREEN, NORM, atom->CATEGORY, atom->PVR);
210	return 0;	210	return 0;
211	}	211	}
212		212
213	snprintf(buf, sizeof(buf), "%s/%s/%s/CONTENTS", portvdb, atom->CATEGORY, atom->P);	213	snprintf(buf, sizeof(buf), "%s/%s/%s/CONTENTS", portvdb, atom->CATEGORY, atom->PVR);
214	if ((fp = fopen(buf, "r")) == NULL)	214	if ((fp = fopen(buf, "r")) == NULL)
215	return -1;	215	return -1;
216		216
Lines 245-251 Link Here
245	fclose(out);	245	fclose(out);
246	fclose(fp);	246	fclose(fp);
247		247
248	printf(" %s-%s %s/%s: ", GREEN, NORM, atom->CATEGORY, atom->P);	248	printf(" %s-%s %s/%s: ", GREEN, NORM, atom->CATEGORY, atom->PVR);
249	fflush(stdout);	249	fflush(stdout);
250		250
251	snprintf(tbz2, sizeof(tbz2), "%s/bin.tar.bz2", tmpdir);	251	snprintf(tbz2, sizeof(tbz2), "%s/bin.tar.bz2", tmpdir);
Lines 255-261 Link Here
255	pclose(fp);	255	pclose(fp);
256		256
257	snprintf(xpak, sizeof(xpak), "%s/inf.xpak", tmpdir);	257	snprintf(xpak, sizeof(xpak), "%s/inf.xpak", tmpdir);
258	snprintf(buf, sizeof(buf), "%s/%s/%s", portvdb, atom->CATEGORY, atom->P);	258	snprintf(buf, sizeof(buf), "%s/%s/%s", portvdb, atom->CATEGORY, atom->PVR);
259	xpak_argv[0] = buf;	259	xpak_argv[0] = buf;
260	xpak_argv[1] = NULL;	260	xpak_argv[1] = NULL;
261	xpak_create(xpak, 1, xpak_argv);	261	xpak_create(xpak, 1, xpak_argv);
Lines 267-273 Link Here
267	unlink(xpak);	267	unlink(xpak);
268	unlink(tbz2);	268	unlink(tbz2);
269		269
270	snprintf(tbz2, sizeof(tbz2), "%s/%s.tbz2", qpkg_get_bindir(), atom->P);	270	snprintf(tbz2, sizeof(tbz2), "%s/%s.tbz2", qpkg_get_bindir(), atom->PVR);
271	if (rename(buf, tbz2)) {	271	if (rename(buf, tbz2)) {
272	warnp("could not move '%s' to '%s'", buf, tbz2);	272	warnp("could not move '%s' to '%s'", buf, tbz2);
273	return 1;	273	return 1;