July 2009 - Pacman-dev - lists.archlinux.org

[pacman-dev] Package upgrade issues: False file conflicts
by Thomas Bächler 19 Jul '09

19 Jul '09

[i686][13:25:40][thomas@artin trunk]$ su -c "pacman -Ud klibc-1.5.14-1-i686.pkg.tar.gz" Password: loading package data... (1/1) checking for file conflicts [-----------------------------------------------------------------------------------------------------------------------------------------------] 100% error: failed to prepare transaction (conflicting files) klibc: /usr/lib/klibc/bin/mknod exists in filesystem klibc: /usr/lib/klibc/include/asm/Kbuild exists in filesystem klibc: /usr/lib/klibc/include/asm/a.out-core.h exists in filesystem klibc: /usr/lib/klibc/include/asm/a.out.h exists in filesystem klibc: /usr/lib/klibc/include/asm/acpi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/agp.h exists in filesystem klibc: /usr/lib/klibc/include/asm/alternative-asm.h exists in filesystem klibc: /usr/lib/klibc/include/asm/alternative.h exists in filesystem klibc: /usr/lib/klibc/include/asm/apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/arch_hooks.h exists in filesystem klibc: /usr/lib/klibc/include/asm/asm-offsets.h exists in filesystem klibc: /usr/lib/klibc/include/asm/asm.h exists in filesystem klibc: /usr/lib/klibc/include/asm/atomic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/atomic_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/atomic_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/auxvec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/bios_ebda.h exists in filesystem klibc: /usr/lib/klibc/include/asm/bitops.h exists in filesystem klibc: /usr/lib/klibc/include/asm/boot.h exists in filesystem klibc: /usr/lib/klibc/include/asm/bootparam.h exists in filesystem klibc: /usr/lib/klibc/include/asm/bug.h exists in filesystem klibc: /usr/lib/klibc/include/asm/bugs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/byteorder.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cache.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cacheflush.h exists in filesystem klibc: /usr/lib/klibc/include/asm/calgary.h exists in filesystem klibc: /usr/lib/klibc/include/asm/calling.h exists in filesystem klibc: /usr/lib/klibc/include/asm/checksum.h exists in filesystem klibc: /usr/lib/klibc/include/asm/checksum_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/checksum_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cmpxchg.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cmpxchg_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cmpxchg_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/compat.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cpu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cpufeature.h exists in filesystem klibc: /usr/lib/klibc/include/asm/cputime.h exists in filesystem klibc: /usr/lib/klibc/include/asm/current.h exists in filesystem klibc: /usr/lib/klibc/include/asm/current_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/current_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/debugreg.h exists in filesystem klibc: /usr/lib/klibc/include/asm/delay.h exists in filesystem klibc: /usr/lib/klibc/include/asm/desc.h exists in filesystem klibc: /usr/lib/klibc/include/asm/desc_defs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/device.h exists in filesystem klibc: /usr/lib/klibc/include/asm/div64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/dma-mapping.h exists in filesystem klibc: /usr/lib/klibc/include/asm/dma.h exists in filesystem klibc: /usr/lib/klibc/include/asm/dmi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ds.h exists in filesystem klibc: /usr/lib/klibc/include/asm/dwarf2.h exists in filesystem klibc: /usr/lib/klibc/include/asm/dwarf2_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/dwarf2_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/e820.h exists in filesystem klibc: /usr/lib/klibc/include/asm/e820_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/e820_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/edac.h exists in filesystem klibc: /usr/lib/klibc/include/asm/efi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/elf.h exists in filesystem klibc: /usr/lib/klibc/include/asm/emergency-restart.h exists in filesystem klibc: /usr/lib/klibc/include/asm/errno.h exists in filesystem klibc: /usr/lib/klibc/include/asm/fb.h exists in filesystem klibc: /usr/lib/klibc/include/asm/fcntl.h exists in filesystem klibc: /usr/lib/klibc/include/asm/fixmap.h exists in filesystem klibc: /usr/lib/klibc/include/asm/fixmap_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/fixmap_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/floppy.h exists in filesystem klibc: /usr/lib/klibc/include/asm/frame.h exists in filesystem klibc: /usr/lib/klibc/include/asm/futex.h exists in filesystem klibc: /usr/lib/klibc/include/asm/gart.h exists in filesystem klibc: /usr/lib/klibc/include/asm/genapic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/genapic_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/genapic_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/geode.h exists in filesystem klibc: /usr/lib/klibc/include/asm/gpio.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hardirq.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hardirq_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hardirq_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/highmem.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hpet.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hugetlb.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hw_irq.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hw_irq_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hw_irq_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/hypertransport.h exists in filesystem klibc: /usr/lib/klibc/include/asm/i387.h exists in filesystem klibc: /usr/lib/klibc/include/asm/i8253.h exists in filesystem klibc: /usr/lib/klibc/include/asm/i8259.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ia32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ia32_unistd.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ide.h exists in filesystem klibc: /usr/lib/klibc/include/asm/idle.h exists in filesystem klibc: /usr/lib/klibc/include/asm/intel_arch_perfmon.h exists in filesystem klibc: /usr/lib/klibc/include/asm/io.h exists in filesystem klibc: /usr/lib/klibc/include/asm/io_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/io_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/io_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ioctl.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ioctls.h exists in filesystem klibc: /usr/lib/klibc/include/asm/iommu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ipcbuf.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ipi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/irq.h exists in filesystem klibc: /usr/lib/klibc/include/asm/irq_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/irq_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/irq_regs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/irq_regs_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/irq_regs_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/irqflags.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ist.h exists in filesystem klibc: /usr/lib/klibc/include/asm/k8.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kdebug.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kexec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kgdb.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kmap_types.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kprobes.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kvm.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kvm_host.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kvm_para.h exists in filesystem klibc: /usr/lib/klibc/include/asm/kvm_x86_emulate.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ldt.h exists in filesystem klibc: /usr/lib/klibc/include/asm/lguest.h exists in filesystem klibc: /usr/lib/klibc/include/asm/lguest_hcall.h exists in filesystem klibc: /usr/lib/klibc/include/asm/linkage.h exists in filesystem klibc: /usr/lib/klibc/include/asm/local.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-bigsmp/mach_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-bigsmp/mach_apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-bigsmp/mach_ipi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-bigsmp/mach_mpspec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/apm.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/do_timer.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/entry_arch.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/irq_vectors.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/irq_vectors_limits.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_ipi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_mpparse.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_mpspec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_timer.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_traps.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/mach_wakecpu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/pci-functions.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/setup_arch.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-default/smpboot_hooks.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-es7000/mach_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-es7000/mach_apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-es7000/mach_ipi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-es7000/mach_mpparse.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-es7000/mach_mpspec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-es7000/mach_wakecpu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-generic/gpio.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-generic/irq_vectors_limits.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-generic/mach_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-generic/mach_apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-generic/mach_ipi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-generic/mach_mpparse.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-generic/mach_mpspec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-numaq/mach_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-numaq/mach_apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-numaq/mach_ipi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-numaq/mach_mpparse.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-numaq/mach_mpspec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-numaq/mach_wakecpu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-rdc321x/gpio.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-rdc321x/rdc321x_defs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-summit/irq_vectors_limits.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-summit/mach_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-summit/mach_apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-summit/mach_ipi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-summit/mach_mpparse.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-summit/mach_mpspec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/cobalt.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/entry_arch.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/irq_vectors.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/lithium.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/mach_apic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/mach_apicdef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/piix4.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/setup_arch.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-visws/smpboot_hooks.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-voyager/do_timer.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-voyager/entry_arch.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-voyager/irq_vectors.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mach-voyager/setup_arch.h exists in filesystem klibc: /usr/lib/klibc/include/asm/math_emu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mc146818rtc.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mca.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mca_dma.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mce.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mman.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmu_context.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmu_context_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmu_context_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmx.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmzone.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmzone_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mmzone_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/module.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mpspec.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mpspec_def.h exists in filesystem klibc: /usr/lib/klibc/include/asm/msgbuf.h exists in filesystem klibc: /usr/lib/klibc/include/asm/msidef.h exists in filesystem klibc: /usr/lib/klibc/include/asm/msr-index.h exists in filesystem klibc: /usr/lib/klibc/include/asm/msr.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mtrr.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mutex.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mutex_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/mutex_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/namei.h exists in filesystem klibc: /usr/lib/klibc/include/asm/nmi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/nops.h exists in filesystem klibc: /usr/lib/klibc/include/asm/numa.h exists in filesystem klibc: /usr/lib/klibc/include/asm/numa_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/numa_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/numaq.h exists in filesystem klibc: /usr/lib/klibc/include/asm/olpc.h exists in filesystem klibc: /usr/lib/klibc/include/asm/page.h exists in filesystem klibc: /usr/lib/klibc/include/asm/page_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/page_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/param.h exists in filesystem klibc: /usr/lib/klibc/include/asm/paravirt.h exists in filesystem klibc: /usr/lib/klibc/include/asm/parport.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pat.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pci-direct.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pci.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pci_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pci_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pda.h exists in filesystem klibc: /usr/lib/klibc/include/asm/percpu.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgalloc.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgtable-2level-defs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgtable-2level.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgtable-3level-defs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgtable-3level.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgtable.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgtable_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pgtable_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/poll.h exists in filesystem klibc: /usr/lib/klibc/include/asm/posix_types.h exists in filesystem klibc: /usr/lib/klibc/include/asm/posix_types_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/posix_types_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/prctl.h exists in filesystem klibc: /usr/lib/klibc/include/asm/processor-cyrix.h exists in filesystem klibc: /usr/lib/klibc/include/asm/processor-flags.h exists in filesystem klibc: /usr/lib/klibc/include/asm/processor.h exists in filesystem klibc: /usr/lib/klibc/include/asm/proto.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ptrace-abi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ptrace.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pvclock-abi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/pvclock.h exists in filesystem klibc: /usr/lib/klibc/include/asm/reboot.h exists in filesystem klibc: /usr/lib/klibc/include/asm/reboot_fixups.h exists in filesystem klibc: /usr/lib/klibc/include/asm/required-features.h exists in filesystem klibc: /usr/lib/klibc/include/asm/resource.h exists in filesystem klibc: /usr/lib/klibc/include/asm/resume-trace.h exists in filesystem klibc: /usr/lib/klibc/include/asm/rio.h exists in filesystem klibc: /usr/lib/klibc/include/asm/rtc.h exists in filesystem klibc: /usr/lib/klibc/include/asm/rwlock.h exists in filesystem klibc: /usr/lib/klibc/include/asm/rwsem.h exists in filesystem klibc: /usr/lib/klibc/include/asm/scatterlist.h exists in filesystem klibc: /usr/lib/klibc/include/asm/seccomp.h exists in filesystem klibc: /usr/lib/klibc/include/asm/seccomp_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/seccomp_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/sections.h exists in filesystem klibc: /usr/lib/klibc/include/asm/segment.h exists in filesystem klibc: /usr/lib/klibc/include/asm/semaphore.h exists in filesystem klibc: /usr/lib/klibc/include/asm/sembuf.h exists in filesystem klibc: /usr/lib/klibc/include/asm/serial.h exists in filesystem klibc: /usr/lib/klibc/include/asm/setup.h exists in filesystem klibc: /usr/lib/klibc/include/asm/shmbuf.h exists in filesystem klibc: /usr/lib/klibc/include/asm/shmparam.h exists in filesystem klibc: /usr/lib/klibc/include/asm/sigcontext.h exists in filesystem klibc: /usr/lib/klibc/include/asm/sigcontext32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/siginfo.h exists in filesystem klibc: /usr/lib/klibc/include/asm/signal.h exists in filesystem klibc: /usr/lib/klibc/include/asm/smp.h exists in filesystem klibc: /usr/lib/klibc/include/asm/socket.h exists in filesystem klibc: /usr/lib/klibc/include/asm/sockios.h exists in filesystem klibc: /usr/lib/klibc/include/asm/sparsemem.h exists in filesystem klibc: /usr/lib/klibc/include/asm/spinlock.h exists in filesystem klibc: /usr/lib/klibc/include/asm/spinlock_types.h exists in filesystem klibc: /usr/lib/klibc/include/asm/srat.h exists in filesystem klibc: /usr/lib/klibc/include/asm/stacktrace.h exists in filesystem klibc: /usr/lib/klibc/include/asm/stat.h exists in filesystem klibc: /usr/lib/klibc/include/asm/statfs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/string.h exists in filesystem klibc: /usr/lib/klibc/include/asm/string_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/string_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/suspend.h exists in filesystem klibc: /usr/lib/klibc/include/asm/suspend_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/suspend_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/swiotlb.h exists in filesystem klibc: /usr/lib/klibc/include/asm/sync_bitops.h exists in filesystem klibc: /usr/lib/klibc/include/asm/system.h exists in filesystem klibc: /usr/lib/klibc/include/asm/system_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/tce.h exists in filesystem klibc: /usr/lib/klibc/include/asm/termbits.h exists in filesystem klibc: /usr/lib/klibc/include/asm/termios.h exists in filesystem klibc: /usr/lib/klibc/include/asm/therm_throt.h exists in filesystem klibc: /usr/lib/klibc/include/asm/thread_info.h exists in filesystem klibc: /usr/lib/klibc/include/asm/thread_info_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/thread_info_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/time.h exists in filesystem klibc: /usr/lib/klibc/include/asm/timer.h exists in filesystem klibc: /usr/lib/klibc/include/asm/timex.h exists in filesystem klibc: /usr/lib/klibc/include/asm/tlb.h exists in filesystem klibc: /usr/lib/klibc/include/asm/tlbflush.h exists in filesystem klibc: /usr/lib/klibc/include/asm/topology.h exists in filesystem klibc: /usr/lib/klibc/include/asm/trampoline.h exists in filesystem klibc: /usr/lib/klibc/include/asm/tsc.h exists in filesystem klibc: /usr/lib/klibc/include/asm/types.h exists in filesystem klibc: /usr/lib/klibc/include/asm/uaccess.h exists in filesystem klibc: /usr/lib/klibc/include/asm/uaccess_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/uaccess_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/ucontext.h exists in filesystem klibc: /usr/lib/klibc/include/asm/unaligned.h exists in filesystem klibc: /usr/lib/klibc/include/asm/unistd.h exists in filesystem klibc: /usr/lib/klibc/include/asm/unistd_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/unistd_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/unwind.h exists in filesystem klibc: /usr/lib/klibc/include/asm/user.h exists in filesystem klibc: /usr/lib/klibc/include/asm/user32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/user_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/user_64.h exists in filesystem klibc: /usr/lib/klibc/include/asm/uv/uv_hub.h exists in filesystem klibc: /usr/lib/klibc/include/asm/uv/uv_mmrs.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vdso.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vga.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vgtod.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vic.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vm86.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vmi.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vmi_time.h exists in filesystem klibc: /usr/lib/klibc/include/asm/voyager.h exists in filesystem klibc: /usr/lib/klibc/include/asm/vsyscall.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xen/events.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xen/grant_table.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xen/hypercall.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xen/hypervisor.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xen/interface.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xen/page.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xor.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xor_32.h exists in filesystem klibc: /usr/lib/klibc/include/asm/xor_64.h exists in filesystem errors occurred, no packages were upgraded. The problem seems to be that in the old package /usr/lib/klibc/include/asm is a symlink to another directory which contains these files. In the new package, this symlink is replaced by a directory. pacman thinks that there are file conflicts, while there are none. I cannot find a viable workaround for this.

4 4

[pacman-dev] .so dependencies
by Florian Pritz 19 Jul '09

19 Jul '09

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, It would be awesome if pacman had a list of all needed .so files (like the files list) for a package and could check if those exist when installing it and when removing/updating a lib. Otherwise it can warn the user and/or abort. Obviously the list has to be generated by makepkg when building. This would eliminate all problems with updating libraries. Florian -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iQIcBAEBAgAGBQJKYxMPAAoJEG0WVcFM4cE+mh8P/0eF0qKpYM17kryZ+PNxK6+t aV2fxyUCcB8oi2GYNzIw8iVzLusP5qMHxfbeka4Bb8ulGI18df7GK0OVuyZSkPwO vUJoNihH18kABN5RUn6Tl8zd2Ihfr8uio8HmBxK78+I0BWA4FchAdiWKjhYT64e4 fQIsOxlxxJnInVJDnaZnnI/5A1AJkuCr8eDrLkkdatQC92Be83P06WaDz/veJUlC lgf+lqQ2lYr3h8b1HTLRQWPT+aSFNP/nTW96CXxPUL01bc8WMYlAaQVDk7sHfm+z /WUL4ukVxO2iS2Lpjec4tSXJLn1vaJVB0e043NqsI/fFMkVcglsG+0Ji7FQWtnrV dR8ROmb8TIS73ji9b+uybq1N1ce98ztFYAGzkdSUsdGyzBE12Cr+NrjPtbwbXfW0 NSxxl2IGBjCmTjBY3Af11A7pDLdrTR75dBRVDi5W5iSR+J+pjcl0JA5282S0yAiD FCYbj0WVvfRJYqdZ+v0I2Vo1sDXesWfFXs1b87MXYokzsfAZzvQIrsQnJc1zU5ht EbCDbE5m6qTWiaX/TmdwA0DOz+TTjK+EIkkxPccMfrs7GrKHMJqHgKAysh/SY7Db rt34zeslqeT0IJjxbINAQmA0+0GmXX3Mql4z4Xsr21SHNKyxquEjeooFRoPqRrGv /8YvL8DErqgzA7h2f8d5 =sHp1 -----END PGP SIGNATURE-----

2 1

[pacman-dev] [PATCH 3/3] Add quiet for the --print-uris operation.
by Xavier Chantry 19 Jul '09

19 Jul '09

This implements FS#14208 -Spq will print package name and version -Spqq will print package name Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- doc/pacman.8.txt | 4 +++- src/pacman/pacman.c | 2 +- src/pacman/sync.c | 21 ++++++++++++++------- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index ccff167..420e799 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -311,7 +311,9 @@ linkman:pacman.conf[5]. pacman's output is processed in a script.) Search will only show package names and not repo, version, group, and description information; list will only show package names and omit databases and versions; group will - only show package names and omit group names. + only show package names and omit group names; '\--print-uris' will only + show package names and package versions, and only package names if '-q' is used + twice. *-s, \--search* <'regexp'>:: This will search each package in the sync databases for names or diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 48d45ad..c1b1c2e 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -490,7 +490,7 @@ static int parseargs(int argc, char *argv[]) config->flags |= PM_TRANS_FLAG_NOLOCK; break; case 'q': - config->quiet = 1; + config->quiet++; break; case 'r': config->rootdir = strdup(optarg); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index cb0b8b1..1c3ba32 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -676,14 +676,21 @@ static int sync_trans(alpm_list_t *targets) alpm_list_t *i; for(i = packages; i; i = alpm_list_next(i)) { pmpkg_t *pkg = alpm_list_getdata(i); - pmdb_t *db = alpm_pkg_get_db(pkg); - const char *dburl = alpm_db_get_url(db); - if(dburl) { - printf("%s/%s\n", dburl, alpm_pkg_get_filename(pkg)); + const char *pkgname = alpm_pkg_get_name(pkg); + if(!config->quiet) { + pmdb_t *db = alpm_pkg_get_db(pkg); + const char *dburl = alpm_db_get_url(db); + if(dburl) { + printf("%s/%s\n", dburl, alpm_pkg_get_filename(pkg)); + } else { + /* can't use WARNING here, we don't show warnings in -Sp... */ + pm_fprintf(stderr, PM_LOG_ERROR, _("no database for package: %s\n"), + pkgname); + } + } else if(config->quiet == 1) { + printf("%s %s\n", pkgname, alpm_pkg_get_version(pkg)); } else { - /* can't use WARNING here, we don't show warnings in -Sp... */ - pm_fprintf(stderr, PM_LOG_ERROR, _("no database for package: %s\n"), - alpm_pkg_get_name(pkg)); + printf("%s\n", pkgname); } } -- 1.6.3.3

2 2

[pacman-dev] Segmentation fault during db or package download
by Roman Kyrylych 18 Jul '09

18 Jul '09

Hi! I've been inactive for the past year, so I don't know if this is already fixed. Sometimes I get segmentation fault during downloading db or package. This is the latest output from today. As you may see this is with --debug, but it doesn't really helps to get idea on what may cause the segfault. Targets (3): audacious-plugins-2.1-1 audacious-2.1-1 python-2.6.2-4 Total Download Size: 18.47 MB Total Installed Size: 73.52 MB Proceed with installation? [Y/n] debug: using cachedir: /var/cache/pacman/pkg/ :: Retrieving packages from extra... debug: using 'audacious-plugins-2.1-1-x86_64.pkg.tar.gz' for download progress debug: HTTP_PROXY: (null) debug: http_proxy: (null) debug: FTP_PROXY: (null) debug: ftp_proxy: (null) debug: connected to dev.archlinux.org successfully downloading audacious-plugins-2.1-1-x86_64.pkg.tar.gz... error: segmentation fault Internal pacman error: Segmentation fault. Please submit a full bug report with --debug if appropriate. At the time of this segfault I was connected to a wireless network with quite unstable connection (disconnects are rare, but I think packet loss might have place). Seems like libfetch related issue. Is this known? Or if it's alpm/pacman-related - was something like this fixed in git? P.S.: looks like --debug is not even mentioned in the man page, is this intentional or just forgotten? -- Roman Kyrylych (Роман Кирилич)

5 10

[pacman-dev] Fetch callback patch, take 2
by Dario Freddi 18 Jul '09

18 Jul '09

Hello people, Here goes another chapter of the fetch callback saga. I finally managed to get a patch working on my copy and completed the integration with Shaman. I have attached a patch that is almost completely based upon Sebastian's one, however it does not abstract the logic of xfercommand out to pacman. Now alpm works this way: 1. If the frontend registered a fetch callback, use that 2. If there is a xfercommand, use that 3. If there's nothing, usual behavior You can pull aqpm+shaman master and check out how things work well. In the shaman land, now it works like this. 1. Shaman creates the queue and streams it to Aqpm 2. Aqpm authentifies itself through Policykit 3. Aqpm spawns an helper, running as root (remember that shaman now doesn't run as root or suid) 4. The helper checks for the caller's authorization, and then registers its own callback. It will then stream progress back to Aqpm through DBus In case the patch doesn't cut out, I was thinking about shipping along with Aqpm a bundled alpm with this patch in, and I would appreciate some opinions on that too. -- ------------------- Dario Freddi KDE Developer GPG Key Signature: 511A9A3B

2 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-204-g8ebc077
by dan＠archlinux.org 16 Jul '09

16 Jul '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 8ebc07744ac58ed1e42af3a52d998587fca85f8b (commit) via 2e043aae36bdb8a7591646db00a95dd21f1f368f (commit) from 41a55d4effecfb2914e96ed4a99eb621557c6d2f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8ebc07744ac58ed1e42af3a52d998587fca85f8b Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Jul 8 14:00:25 2009 +0200 Offer to clean up non-package files in cache directory. This implements FS#15142. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2e043aae36bdb8a7591646db00a95dd21f1f368f Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Jul 8 11:08:32 2009 +0200 Run ldconfig inside chroot. This fixes FS#15294. The code to run a command inside a chroot was refactored from the _alpm_runscriptlet function to _alpm_run_chroot. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 1 - lib/libalpm/remove.c | 1 - lib/libalpm/trans.c | 88 +------------------------------------------ lib/libalpm/util.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++- lib/libalpm/util.h | 1 + src/pacman/sync.c | 14 ++++--- 6 files changed, 110 insertions(+), 98 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] questions about pmhandle and pmtrans
by Xavier 16 Jul '09

16 Jul '09

The handle contains the current transaction and the local database : typedef struct _pmhandle_t { /* internal usage */ pmdb_t *db_local; /* local db pointer */ alpm_list_t *dbs_sync; /* List of (pmdb_t *) */ FILE *logstream; /* log file stream pointer */ int lckfd; /* lock file descriptor if one exists */ pmtrans_t *trans; Yet we pass the trans or db_local param to many many functions : $ egrep "pmtrans_t|db_local" lib/libalpm/*.h lib/libalpm/add.h:int _alpm_add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name); lib/libalpm/add.h:int _alpm_upgrade_packages(pmtrans_t *trans, pmdb_t *db); lib/libalpm/alpm.h:typedef struct __pmtrans_t pmtrans_t; lib/libalpm/conflict.h:alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, lib/libalpm/handle.h: pmdb_t *db_local; /* local db pointer */ lib/libalpm/handle.h: pmtrans_t *trans; lib/libalpm/remove.h:int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name); lib/libalpm/remove.h:int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data); lib/libalpm/remove.h:int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db); lib/libalpm/remove.h:int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db); lib/libalpm/sync.h:int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, int enable_downgrade); lib/libalpm/sync.h:int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, char *name); lib/libalpm/sync.h:int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data); lib/libalpm/sync.h:int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data); lib/libalpm/trans.h:struct __pmtrans_t { lib/libalpm/trans.h:pmtrans_t *_alpm_trans_new(void); lib/libalpm/trans.h:void _alpm_trans_free(pmtrans_t *trans); lib/libalpm/trans.h:int _alpm_trans_init(pmtrans_t *trans, pmtransflag_t flags, lib/libalpm/trans.h:int _alpm_trans_prepare(pmtrans_t *trans, alpm_list_t **data); lib/libalpm/trans.h:int _alpm_trans_commit(pmtrans_t *trans, alpm_list_t **data); lib/libalpm/trans.h: const char *oldver, pmtrans_t *trans); So what is the preferred way here? Since we use handle->trans or handle->db_local in some places, why not everywhere? Another thing I am wondering, why these 3 callbacks are part of pmtrans : alpm_trans_cb_event cb_event; alpm_trans_cb_conv cb_conv; alpm_trans_cb_progress cb_progress; and the other callbacks are in pmhandle : /* callback functions */ alpm_cb_log logcb; /* Log callback function */ alpm_cb_download dlcb; /* Download callback function */ alpm_cb_totaldl totaldlcb; /* Total download callback function */ Why not having all callbacks in the handle? At least in pacman frontend, cb_event, cb_conv and cb_progress are the same for all transactions.

1 1

[pacman-dev] nautilus extension for packages
by K. Piche 16 Jul '09

16 Jul '09

Hi, Aaron suggested I send this here to put in contrib. Haven't made any changes since the original announcement on arch-dev-public. Regards, k -- K. Piche <kpiche(a)rogers.com>

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-202-g41a55d4
by dan＠archlinux.org 16 Jul '09

16 Jul '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 41a55d4effecfb2914e96ed4a99eb621557c6d2f (commit) via 5dc0b80c2683551c10b96157ba34b277db25b82d (commit) via 104daa16a69708c9b16fc59ac895f2932ea509d4 (commit) via caa0f2205a62344c4df6e286e14a0d89cd1d10f2 (commit) via 68c10690eae369928b6cdc2d658588ad06e4b1a5 (commit) via 8d7764abaecb89a5baa6b4afe25f4db8e8a40465 (commit) via 6092dda1775a3d887d557c0e4961645a4ed67064 (commit) via e72cce352a4f43e371998dc8985b5fa2e0102216 (commit) via 621aa26e26fcf578221051e896d6440a0095b8a3 (commit) via b312c820c8c8ed98a8b8f927b948bca8a3a22632 (commit) via 617e7d512ff6fb7d6c5e5232091b528148cc40c7 (commit) from c72b4543b69f5a80d254a3f408748e19db758947 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 41a55d4effecfb2914e96ed4a99eb621557c6d2f Author: Volodia Macovei <blog(a)volodia.ro> Date: Wed Jul 1 11:06:02 2009 -0500 Update Romanian translation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5dc0b80c2683551c10b96157ba34b277db25b82d Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 12 17:10:11 2009 +1000 makepkg: clean up BUILDSCRIPT usage FS#15448 (which is made worse by the "fix" for FS#14727...), highlighted some deficiencies in the usage of the BUILDSCRIPT variable. In particular, only relative paths worked with "-p" and some output was very strange in combination with the "-p" flag or reading from /dev/stdin. e.g. "Please add a license line to your /dev/stdin!". This patch adds a new variable, BUILDFILE, which contains the full path to the BUILDSCRIPT. This defaults to $startdir/$BUILDSCRIPT. Also, fix a missed quoting of $BUILD{SCRIPT->FILE} and remove warning about missing BUILDSCRIPT definition in makepkg.conf as the default BUILDSCRIPT value is now specified during configure. Add check that BUILDFILE is writable before updating VCS PKGBUILDs. When making a source package, the BUILDSCRIPT always gets given the default name, regardless of what it was originally called. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 104daa16a69708c9b16fc59ac895f2932ea509d4 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 12 01:07:46 2009 +1000 makepkg: allow spaces in source file names The download command failed with sources that contained spaces. Remainder of fix for FS#15323. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit caa0f2205a62344c4df6e286e14a0d89cd1d10f2 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jul 1 02:31:59 2009 -0500 makepkg: fix breakage with '%' in source filenames Ensure we don't pass a bare filename to printf that might contain a lookalike '%' escape sequence. Fixes part of FS#15323. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 68c10690eae369928b6cdc2d658588ad06e4b1a5 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jul 1 02:26:27 2009 -0500 makepkg: quote filenames when extracting We currently fall apart on files with spaces in the names. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8d7764abaecb89a5baa6b4afe25f4db8e8a40465 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jul 10 00:31:20 2009 +1000 Quote values in the arch array in example PKGBUILD Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6092dda1775a3d887d557c0e4961645a4ed67064 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 4 03:16:14 2009 +1000 makepkg: check for package functions when package splitting Makes sure the required package functions are present when using package splitting. Also moves setting of pkgbase variable outside the check_sanity function to somewhere more appropriate. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e72cce352a4f43e371998dc8985b5fa2e0102216 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 4 02:28:03 2009 +1000 makepkg: fix pkgdesc restoration with split packaging A pkgdesc with spaces in it would get restored to an array and thus only the first word would be restored (FS#15210). Convert that array back to a string. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 621aa26e26fcf578221051e896d6440a0095b8a3 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 4 01:52:28 2009 +1000 makepkg: Exit on failure within build() or package() functions Errors in build() functions were only fatal, if "--log" was enabled. Errors in package() functions were never fatal. Piping these functions through "cat -" triggers error trapping. This prevents the need for "|| return 1" usage in PKGBUILDs. Original-patch-by: Juergen Hoetzel <juergen(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b312c820c8c8ed98a8b8f927b948bca8a3a22632 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jul 2 13:53:29 2009 +1000 makepkg: fix check for previously built packages with package splitting Checks if some or all packages are built before overwriting/installing. Adds some new strings for translation. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 617e7d512ff6fb7d6c5e5232091b528148cc40c7 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 1 13:52:52 2009 +1000 makepkg: clean up moving PKGINFO creation to a function Someone forgot to commit this when pulling in the original patch to his working branch... Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD-example.txt | 2 +- po/ro.po | 8 +- scripts/makepkg.sh.in | 137 ++++++++++++++++++++++++++++++---------------- 3 files changed, 95 insertions(+), 52 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: clean up BUILDSCRIPT usage
by Allan McRae 12 Jul '09

12 Jul '09

FS#15448 (which is made worse by the "fix" for FS#14727...), highlighted some deficiencies in the usage of the BUILDSCRIPT variable. In particular, only relative paths worked with "-p" and some output was very strange in combination with the "-p" flag or reading from /dev/stdin. e.g. "Please add a license line to your /dev/stdin!". This patch adds a new variable, BUILDFILE, which contains the full path to the BUILDSCRIPT. This defaults to $startdir/$BUILDSCRIPT. Also, fix a missed quoting of $BUILD{SCRIPT->FILE} and remove warning about missing BUILDSCRIPT definition in makepkg.conf as the default BUILDSCRIPT value is not specified during configure. Add check that BUILDFILE is writeable before udpating VCS PKGBUILDs. When making a source package, the BUILDSCRIPT always gets given the default name, regardless of what it was originally called. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8998e0d..50cf54d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1032,7 +1032,7 @@ create_srcpackage() { mkdir "${srclinks}"/${pkgbase} msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT" - ln -s "${startdir}/${BUILDSCRIPT}" "${srclinks}/${pkgbase}/" + ln -s "${BUILDFILE}" "${srclinks}/${pkgbase}/${BUILDSCRIPT}" if [ -n "$install" ]; then if [ -f $install ]; then @@ -1192,8 +1192,9 @@ devel_check() { newpkgver="" # Do not update pkgver if --holdver is set, when building a source package, - # or when reading PKGBUILD from pipe - if [ "$HOLDVER" -eq 1 -o "$SOURCEONLY" -ne 0 -o ! -f "./$BUILDSCRIPT" ]; then + # when reading PKGBUILD from pipe (-f), or if we cannot write to the file (-w) + if [ "$HOLDVER" -eq 1 -o "$SOURCEONLY" -ne 0 -o ! -f "$BUILDFILE" \ + -o ! -w "$BUILDFILE" ]; then return fi @@ -1262,10 +1263,10 @@ devel_update() { # if [ -n "$newpkgver" ]; then if [ "$newpkgver" != "$pkgver" ]; then - if [ -f "./$BUILDSCRIPT" ]; then - @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" - @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" - source "$BUILDSCRIPT" + if [ -f "$BUILDFILE" -a -w "$BUILDFILE" ]; then + @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" + @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" + source "$BUILDFILE" fi fi fi @@ -1480,7 +1481,7 @@ while true; do -L|--log) LOGGING=1 ;; -m|--nocolor) USE_COLOR='n' ;; -o|--nobuild) NOBUILD=1 ;; - -p) shift; BUILDSCRIPT=$1 ;; + -p) shift; BUILDFILE=$1 ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --source) SOURCEONLY=1 ;; @@ -1565,11 +1566,6 @@ if [ "$CLEANCACHE" -eq 1 ]; then fi fi -if [ -z "$BUILDSCRIPT" ]; then - error "$(gettext "BUILDSCRIPT is undefined! Ensure you have updated %s.")" "$MAKEPKG_CONF" - exit 1 -fi - if [ "$INFAKEROOT" -eq 0 ]; then if [ $EUID -eq 0 -a "$ASROOT" -eq 0 ]; then # Warn those who like to live dangerously. @@ -1616,23 +1612,27 @@ unset pkgname pkgbase pkgver pkgrel pkgdesc url license groups provides unset md5sums replaces depends conflicts backup source install build unset makedepends optdepends options noextract -if [ ! -f "$BUILDSCRIPT" ]; then +BUILDFILE=${BUILDFILE:-$BUILDSCRIPT} +if [ ! -f "$BUILDFILE" ]; then if [ -t 0 ]; then - error "$(gettext "%s does not exist.")" "$BUILDSCRIPT" + error "$(gettext "%s does not exist.")" "$BUILDFILE" exit 1 else # PKGBUILD passed through a pipe - BUILDSCRIPT=/dev/stdin - source "$BUILDSCRIPT" + BUILDFILE=/dev/stdin + source "$BUILDFILE" fi else - crlftest=$(file $BUILDSCRIPT | grep -F 'CRLF' || true) + crlftest=$(file "$BUILDFILE" | grep -F 'CRLF' || true) if [ -n "$crlftest" ]; then - error "$(gettext "%s contains CRLF characters and cannot be sourced.")" "$BUILDSCRIPT" + error "$(gettext "%s contains CRLF characters and cannot be sourced.")" "$BUILDFILE" exit 1 fi - source ./"$BUILDSCRIPT" + if [ "${BUILDFILE:0:1}" != "/" ]; then + BUILDFILE="$startdir/$BUILDFILE" + fi + source "$BUILDFILE" fi if [ "$GENINTEG" -eq 1 ]; then -- 1.6.3.3

1 0