1.1 --- a/plover-gtk/transactionhelper.c	Mon Aug 31 07:07:40 2020 +0100
     1.2 +++ b/plover-gtk/transactionhelper.c	Tue Jun 29 10:08:58 2021 +0100
     1.3 @@ -492,10 +492,12 @@
     1.4      g_return_val_if_fail(PLOVER_IS_TRANSACTION_HELPER(helper),NULL);
     1.5      if (!helper->installed)
     1.6      {
     1.7 -	comps=plover_transaction_helper_get_comps(helper,NULL);
     1.8 +	comps=plover_transaction_helper_get_comps(helper,&error);
     1.9  	if (!comps)
    1.10  	{
    1.11 -	    g_warning("plover_transaction_helper_get_installed: No comps");
    1.12 +	    g_warning("plover_transaction_helper_get_installed: No comps: %s",
    1.13 +	      error->message);
    1.14 +	    g_error_free(error);
    1.15  	    return NULL;
    1.16  	}
    1.17  	install_root=getenv("RAZOR_ROOT");
    1.18 @@ -656,13 +658,22 @@
    1.19    plover_transaction_helper_get_comps(PloverTransactionHelper *helper,
    1.20    GError **error)
    1.21  {
    1.22 -    gchar *s;
    1.23 +    char *s;
    1.24 +    GError *tmp_err=NULL;
    1.25      g_return_val_if_fail(PLOVER_IS_TRANSACTION_HELPER(helper),NULL);
    1.26      if (!helper->comps && helper->base_uri)
    1.27      {
    1.28 -	s=g_strconcat(helper->base_uri,"/repodata/comps.xml",NULL);
    1.29 -	helper->comps=plover_comps_new_from_uri(s,error);
    1.30 -	g_free(s);
    1.31 +	s=razor_path_relative_to_uri(helper->base_uri,"repodata/comps.xml",
    1.32 +	  NULL);
    1.33 +	helper->comps=plover_comps_new_from_uri(s,&tmp_err);
    1.34 +	if (!helper->comps)
    1.35 +	{
    1.36 +	    g_warning(
    1.37 +	      "PloverTransactionHelper: Failed to get comps at '%s': %s",
    1.38 +	      s,tmp_err->message);
    1.39 +	    g_propagate_error(error,tmp_err);
    1.40 +	}
    1.41 +	free(s);
    1.42      }
    1.43      return helper->comps;
    1.44  }