[arch-dev-public] [PATCH] check_packages: fix stupid assumption on script location.
The parse_pkgbuilds.sh script was assumed to be in the current working directory, which is quite stupid since check_packages.py can be called from anywhere. Now it only assumes that check_packages.py and parse_pkgbuilds.sh are in the same directory. This should fix the empty integrity checks on arch-dev :) Signed-off-by: Xavier Chantry <shiningxc@gmail.com> --- cron-jobs/check_archlinux/check_packages.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cron-jobs/check_archlinux/check_packages.py b/cron-jobs/check_archlinux/check_packages.py index f0fd4a5..0392368 100755 --- a/cron-jobs/check_archlinux/check_packages.py +++ b/cron-jobs/check_archlinux/check_packages.py @@ -50,12 +50,10 @@ class Depend: self.mod = mod def parse_pkgbuilds(repos,arch): - oldcwd = os.getcwd() - os.chdir(absroot) for repo in repos: - data = commands.getoutput(oldcwd + '/parse_pkgbuilds.sh ' + arch + ' ' + repo) + data = commands.getoutput(os.path.dirname(sys.argv[0]) + '/parse_pkgbuilds.sh ' + + arch + ' ' + absroot + '/' + repo) parse_data(repo,data) - os.chdir(oldcwd) def parse_data(repo,data): attrname = None -- 1.6.1.2
On Sun, Feb 1, 2009 at 1:59 PM, Xavier Chantry <shiningxc@gmail.com> wrote:
The parse_pkgbuilds.sh script was assumed to be in the current working directory, which is quite stupid since check_packages.py can be called from anywhere. Now it only assumes that check_packages.py and parse_pkgbuilds.sh are in the same directory.
This should fix the empty integrity checks on arch-dev :)
Applied, thanks for looking into this. Seems to work now with this change and the others we made today. -Dan
On Sun, Feb 1, 2009 at 2:48 PM, Dan McGee <dpmcgee@gmail.com> wrote:
On Sun, Feb 1, 2009 at 1:59 PM, Xavier Chantry <shiningxc@gmail.com> wrote:
The parse_pkgbuilds.sh script was assumed to be in the current working directory, which is quite stupid since check_packages.py can be called from anywhere. Now it only assumes that check_packages.py and parse_pkgbuilds.sh are in the same directory.
This should fix the empty integrity checks on arch-dev :)
Applied, thanks for looking into this. Seems to work now with this change and the others we made today.
Eeek, did you git pull the dbscripts on gerolde? That's bad, try not to do that too regularly, as I'm not sure what changes the repo may have. Additionally, could you make sure to tag when you pull it live, so that we can more easily determine where things break
On Mon, Feb 2, 2009 at 1:09 PM, Aaron Griffin <aaronmgriffin@gmail.com> wrote:
On Sun, Feb 1, 2009 at 2:48 PM, Dan McGee <dpmcgee@gmail.com> wrote:
On Sun, Feb 1, 2009 at 1:59 PM, Xavier Chantry <shiningxc@gmail.com> wrote:
The parse_pkgbuilds.sh script was assumed to be in the current working directory, which is quite stupid since check_packages.py can be called from anywhere. Now it only assumes that check_packages.py and parse_pkgbuilds.sh are in the same directory.
This should fix the empty integrity checks on arch-dev :)
Applied, thanks for looking into this. Seems to work now with this change and the others we made today.
Eeek, did you git pull the dbscripts on gerolde? That's bad, try not to do that too regularly, as I'm not sure what changes the repo may have. Additionally, could you make sure to tag when you pull it live, so that we can more easily determine where things break
Yeah, I did, but I made sure I wasn't going to unintentionally pull in anything extra first. It was just this change, and if you want to be sure, look at the reflog: $ git reflog show d9df504... HEAD@{0}: pull : Fast forward 6e0ea2d... HEAD@{1}: commit (merge): Merge branch 'master' of file:///srv/projects/git/dbscripts 3fb6203... HEAD@{2}: commit: Only copy DB file from repo if we have pkgs 252e11f... HEAD@{3}: pull : Fast forward 3606df7... HEAD@{4}: clone: from file:///srv/projects/git/dbscripts.git/ -Dan
2009/2/2 Dan McGee <dpmcgee@gmail.com>:
On Mon, Feb 2, 2009 at 1:09 PM, Aaron Griffin <aaronmgriffin@gmail.com> wrote:
On Sun, Feb 1, 2009 at 2:48 PM, Dan McGee <dpmcgee@gmail.com> wrote:
On Sun, Feb 1, 2009 at 1:59 PM, Xavier Chantry <shiningxc@gmail.com> wrote:
The parse_pkgbuilds.sh script was assumed to be in the current working directory, which is quite stupid since check_packages.py can be called from anywhere. Now it only assumes that check_packages.py and parse_pkgbuilds.sh are in the same directory.
This should fix the empty integrity checks on arch-dev :)
Applied, thanks for looking into this. Seems to work now with this change and the others we made today.
Eeek, did you git pull the dbscripts on gerolde? That's bad, try not to do that too regularly, as I'm not sure what changes the repo may have. Additionally, could you make sure to tag when you pull it live, so that we can more easily determine where things break
Yeah, I did, but I made sure I wasn't going to unintentionally pull in anything extra first. It was just this change, and if you want to be sure, look at the reflog:
$ git reflog show d9df504... HEAD@{0}: pull : Fast forward 6e0ea2d... HEAD@{1}: commit (merge): Merge branch 'master' of file:///srv/projects/git/dbscripts 3fb6203... HEAD@{2}: commit: Only copy DB file from repo if we have pkgs 252e11f... HEAD@{3}: pull : Fast forward 3606df7... HEAD@{4}: clone: from file:///srv/projects/git/dbscripts.git/
-Dan
Haha reflog! I still remember the day I figured out that stood for "reference log" and not "whip again". I felt such a schmuck. Dusty
participants (4)
-
Aaron Griffin
-
Dan McGee
-
Dusty Phillips
-
Xavier Chantry