Bug 31577
| Summary: | 1.2.0-alt1 добавляет несуществующий репозитарий "x86_64-i586 task" | ||
|---|---|---|---|
| Product: | Sisyphus | Reporter: | Ivan Zakharyaschev <imz> |
| Component: | apt-repo | Assignee: | Andrey Cherepanov <cas> |
| Status: | CLOSED FIXED | QA Contact: | qa-sisyphus |
| Severity: | normal | ||
| Priority: | P3 | CC: | cas, vt |
| Version: | unstable | ||
| Hardware: | all | ||
| OS: | Linux | ||
| Bug Depends on: | |||
| Bug Blocks: | 29690 | ||
apt-repo-1.3.0-alt1 -> sisyphus: * Mon Apr 25 2016 Andrey Cherepanov <cas@altlinux> 1.3.0-alt1 - Add p8 branch (ALT #32006) - Add support for altlinuxclub sources - Add arepo repo for task only if it exists (ALT #31577) - Use new format of source (ALT #31974) - Optional package name(s) support in apt-repo test - Remove duplicate package names in task list - Do not use strict extension for compessed man page Попробовал, но эта проверка не даёт желаемого результата -- там пустой файл: [root@ovicaa ~]# rpm -q apt-repo apt-repo-1.3.3-alt1 [root@ovicaa ~]# apt-repo rpm [updates] http://ftp.altlinux.org/pub/distributions/ALTLinux t7/branch/x86_64 classic rpm [updates] http://ftp.altlinux.org/pub/distributions/ALTLinux t7/branch/noarch classic rpm [updates] http://ftp.altlinux.org/pub/distributions/ALTLinux t7/branch/x86_64-i586 classic [root@ovicaa ~]# apt-repo add 164430 [root@ovicaa ~]# apt-repo rpm [updates] http://ftp.altlinux.org/pub/distributions/ALTLinux t7/branch/x86_64 classic rpm [updates] http://ftp.altlinux.org/pub/distributions/ALTLinux t7/branch/noarch classic rpm [updates] http://ftp.altlinux.org/pub/distributions/ALTLinux t7/branch/x86_64-i586 classic rpm http://git.altlinux.org repo/164430/x86_64 task rpm http://git.altlinux.org repo/164430/x86_64-i586 task [root@ovicaa ~]# curl -s -o /dev/null -w '%{http_code}' http://git.altlinux.org/tasks/164430/plan/arepo-add-x86_64-i586 200[root@ovicaa ~curl http://git.altlinux.org/tasks/164430/plan/arepo-add-x86_64-i586; echo $? 0 [root@ovicaa ~]# apt-get update Get:1 http://ftp.altlinux.org t7/branch/x86_64 release [896B] Get:2 http://ftp.altlinux.org t7/branch/noarch release [757B] Get:3 http://ftp.altlinux.org t7/branch/x86_64-i586 release [555B] Get:4 http://git.altlinux.org repo/164430/x86_64 release [556B] Ign http://git.altlinux.org repo/164430/x86_64-i586 release Fetched 2764B in 0s (16,2kB/s) Hit http://git.altlinux.org repo/164430/x86_64/task pkglist Hit http://ftp.altlinux.org t7/branch/x86_64/classic pkglist Hit http://git.altlinux.org repo/164430/x86_64/task release Err http://git.altlinux.org repo/164430/x86_64-i586/task pkglist 404 Not Found Ign http://git.altlinux.org repo/164430/x86_64-i586/task release Hit http://ftp.altlinux.org t7/branch/x86_64/classic release Hit http://ftp.altlinux.org t7/branch/noarch/classic pkglist Hit http://ftp.altlinux.org t7/branch/noarch/classic release Hit http://ftp.altlinux.org t7/branch/x86_64-i586/classic pkglist Hit http://ftp.altlinux.org t7/branch/x86_64-i586/classic release Failed to fetch http://git.altlinux.org/repo/164430/x86_64-i586/base/pkglist.task 404 Not Found Reading Package Lists... Done Building Dependency Tree... Done E: Some index files failed to download, they have been ignored, or old ones used instead. [root@ovicaa ~]# А apt скачать не может, ошибка. Действительно, пустой файл: [imz@ovicaa ~]$ ssh vegro.alt Last login: Mon May 9 17:01:12 2016 from 93.191.18.90 [imz@people ~]$ cd /tasks/164430/plan/ [imz@people plan]$ ls add-bin add-src add-src+bin add-srpm2arch arepo-add-x86_64-i586 arepo-rm-x86_64-i586 bin.list.diff change-arch check_acl del-src-N-I next.bin next.src oldsrc2newsrpm rip-src rm-bin rm-src rm-src+bin rm-srpm2arch src.list.diff [imz@people plan]$ cat arepo-* [imz@people plan]$ Попробовал предложить исправление -- http://git.altlinux.org/people/imz/packages/?p=apt-repo.git . (Заодно свои старые хаки убрал для этого случая.) Идея в том, чтобы проверить, пустой ли вывод curl. Не проверял на task-ах, у которых arepo всё-таки есть. Если попадётся такой task, на котором проверю, думаю, потом уже сразу собрать. Вроде работает: [root@ovicaa ~]# ~imz/TOOLS/ALT-pkgs_misc/apt-repo/apt-repo rpm [updates] http://ftp.altlinux.org/pub/distributions/ALTLinux t7/branch/x86_64 classic rpm [updates] http://ftp.altlinux.org/pub/distributions/ALTLinux t7/branch/noarch classic rpm [updates] http://ftp.altlinux.org/pub/distributions/ALTLinux t7/branch/x86_64-i586 classic [root@ovicaa ~]# ~imz/TOOLS/ALT-pkgs_misc/apt-repo/apt-repo add 164428 [root@ovicaa ~]# ~imz/TOOLS/ALT-pkgs_misc/apt-repo/apt-repo rpm [updates] http://ftp.altlinux.org/pub/distributions/ALTLinux t7/branch/x86_64 classic rpm [updates] http://ftp.altlinux.org/pub/distributions/ALTLinux t7/branch/noarch classic rpm [updates] http://ftp.altlinux.org/pub/distributions/ALTLinux t7/branch/x86_64-i586 classic rpm http://git.altlinux.org repo/164428/x86_64 task rpm http://git.altlinux.org repo/164428/x86_64-i586 task [root@ovicaa ~]# apt-get update Get:1 http://git.altlinux.org repo/164428/x86_64 release [553B] Get:2 http://ftp.altlinux.org t7/branch/x86_64 release [896B] Get:3 http://git.altlinux.org repo/164428/x86_64-i586 release [545B] Get:4 http://ftp.altlinux.org t7/branch/noarch release [757B] Get:5 http://ftp.altlinux.org t7/branch/x86_64-i586 release [555B] Fetched 3306B in 0s (11,4kB/s) Get:1 http://git.altlinux.org repo/164428/x86_64/task pkglist [77,4kB] Hit http://ftp.altlinux.org t7/branch/x86_64/classic pkglist Get:2 http://git.altlinux.org repo/164428/x86_64/task release [132B] Get:3 http://git.altlinux.org repo/164428/x86_64-i586/task pkglist [10,7kB] Hit http://ftp.altlinux.org t7/branch/x86_64/classic release Hit http://ftp.altlinux.org t7/branch/noarch/classic pkglist Hit http://ftp.altlinux.org t7/branch/noarch/classic release Hit http://ftp.altlinux.org t7/branch/x86_64-i586/classic pkglist Hit http://ftp.altlinux.org t7/branch/x86_64-i586/classic release Get:4 http://git.altlinux.org repo/164428/x86_64-i586/task release [137B] Fetched 88,4kB in 0s (301kB/s) Reading Package Lists... Done Building Dependency Tree... Done [root@ovicaa ~]# apt-repo-1.3.4-alt1 -> sisyphus: * Mon May 09 2016 Ivan Zakharyaschev <imz@altlinux> 1.3.4-alt1 - task_has_arepo(): check whether plan/arepo-add-x86_64-i586 is not empty (ALT #31577). - get rid of NO_TASK_AREPO_HACK environment variable (now, as task_has_arepo should work correctly). О, не работает для некоторых task-ов:
$ curl -s -w '%{http_code}' http://git.altlinux.org/tasks/164432/plan/arepo-add-x86_64-i586
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<HTML><HEAD>
<TITLE>404 Not Found</TITLE>
</HEAD><BODY>
<H1>Not Found</H1>
The requested URL /tasks/164432/plan/arepo-add-x86_64-i586 was not found on this server.<P>
</BODY></HTML>
404
Понятно: noarch task-и там дают 404, а arch task-и без arepo дают там пустой файл. Надо было оба случая учесть. А я сменил правильную обработку первого случая на правильную обработку второго.
apt-repo-1.3.5-alt1 -> sisyphus: * Mon May 09 2016 Ivan Zakharyaschev <imz@altlinux> 1.3.5-alt1 - handle both cases without arepo: none (noarch) or empty (ALT #31577). - "apt-repo test [task] '' pkg1 ..." will install the packages without modifying APT repos. (With --hsh-apt-config, this feature is useful to do an install check for a package in a minimal system.) |
Description
Ivan Zakharyaschev 2015-12-01 18:27:32 MSK