diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-02-12 10:55:18 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-02-12 10:55:18 +0000 |
| commit | 3b7fa31be28a12c3e0a81fa4e6cd0c28fc78c7b1 (patch) | |
| tree | 84b86497559ad1afbb75dac73a3ddf30865dec27 | |
| parent | 088b6a686d887e02739c34736520715f737fe0c5 (diff) | |
| download | drakx-3b7fa31be28a12c3e0a81fa4e6cd0c28fc78c7b1.tar drakx-3b7fa31be28a12c3e0a81fa4e6cd0c28fc78c7b1.tar.gz drakx-3b7fa31be28a12c3e0a81fa4e6cd0c28fc78c7b1.tar.bz2 drakx-3b7fa31be28a12c3e0a81fa4e6cd0c28fc78c7b1.tar.xz drakx-3b7fa31be28a12c3e0a81fa4e6cd0c28fc78c7b1.zip | |
adapt to new modules.dep format (prefix modules with directory path)
| -rw-r--r-- | mdk-stage1/NEWS | 1 | ||||
| -rw-r--r-- | mdk-stage1/modules.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index a6d16d8d0..006350208 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,4 @@ +- adapt to new modules.dep format (prefix modules with directory path) - try to use arch-prefixed location for automatic disk installs 1.33: diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c index c25d9358f..de1815584 100644 --- a/mdk-stage1/modules.c +++ b/mdk-stage1/modules.c @@ -156,7 +156,7 @@ static int load_modules_dependencies(void) while (*ptr && (*ptr == ' ')) ptr++; /* sort of a good line */ - modules_deps[line].filename = strdup(start); + modules_deps[line].filename = start[0] == '/' ? strdup(start) : asprintf_("%s/%s", modules_directory, start); modules_deps[line].modname = filename2modname(start); start = ptr; |