Re: [PATCH 1/2] install script: generates the output in a file

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Aug 14, 2012 at 4:31 AM, Fabiano Fidêncio <fabiano@xxxxxxxxxxxx> wrote:
> On Mon, Aug 13, 2012 at 2:54 PM, Zeeshan Ali (Khattak)
> <zeeshanak@xxxxxxxxx> wrote:
>> On Mon, Aug 13, 2012 at 10:37 AM, Fabiano Fidêncio <fabiano@xxxxxxxxxxxx> wrote:
>>> -    jeosScripts = osinfo_install_scriptlist_new_filtered(scripts,
>>> -                                                         filter);
>>> -    if (osinfo_list_get_length(OSINFO_LIST(jeosScripts)) != 1) {
>>> +    if (osinfo_list_get_length(OSINFO_LIST(profileScripts)) != 1) {
>>>          g_printerr("Cannot find any install script for profile '%s'\n",
>>>                     profile ? profile :
>>>                     OSINFO_INSTALL_SCRIPT_PROFILE_JEOS);
>>>          goto cleanup;
>>>      }
>>>
>>> -    script = OSINFO_INSTALL_SCRIPT(osinfo_list_get_nth(OSINFO_LIST(jeosScripts), 0));
>>> -    if (!(data = osinfo_install_script_generate(script,
>>> -                                                os,
>>> -                                                config,
>>> -                                                NULL,
>>> -                                                &error))) {
>>> +    script = OSINFO_INSTALL_SCRIPT(osinfo_list_get_nth(OSINFO_LIST(profileScripts), 0));
>>> +
>>> +    if (prefix)
>>> +        osinfo_install_script_set_output_prefix(script, prefix);
>>> +
>>> +    if (osinfo_install_script_generate_output(script,
>>> +                                              os,
>>> +                                              config,
>>> +                                              dir,
>>> +                                              NULL,
>>> +                                              &error) == NULL) {
>>>          g_printerr("Unable to generate install script: %s\n",
>>>                     error ? error->message : "unknown");
>>>          goto cleanup;
>>>      }
>>>
>>> -    g_print("%s\n", data);
>>> -
>>
>> Pretty sure it was some previous patch of yours that added this so you
>> want to squash this into that patch.
>
> No. It was the old return of the osinfo-install-script tool, so, I
> think it's not wrong.

Ouch, I missed the fact that this is a change to the tool's code. Sorry!

-- 
Regards,

Zeeshan Ali (Khattak)
FSF member#5124


[Index of Archives]     [Linux Virtualization]     [KVM Development]     [CentOS Virtualization]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite Forum]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]     [Video 4 Linux]

  Powered by Linux