Commits

Paul Jones  committed c843855

Make compatible with latest permission structures

  • Participants
  • Parent commits 5658339

Comments (0)

Files changed (2)

 	rm -rf $(CLIENT_PACKAGE_DIR)
 	mkdir -p $(DIST_DIR)
 	mkdir -p $(CLIENT_PACKAGE_DIR)/ebin
-	cp $(EBIN_DIR)/* $(foreach DEP_NAME, $(CLIENT_DEPS), $(PRIV_DEPS_DIR)/$(DEP_NAME)/ebin/*) $(CLIENT_PACKAGE_DIR)/ebin
+	cp $(EBIN_DIR)/* $(foreach DEP_NAME, $(CLIENT_DEPS), $(PRIV_DEPS_DIR)/$(DEP_NAME)*/ebin/*) $(CLIENT_PACKAGE_DIR)/ebin
 	cp $(SCRIPTS_DIR)/* $(CLIENT_PACKAGE_DIR)
 	
 	(cd $(CLIENT_PACKAGE_DIR); zip -r ../../$@ *)

File src/bql_applicator.erl

 retrieve_privileges(User, VHost) ->
     Permissions = rabbit_access_control:list_vhost_permissions(VHost),
     UserPermissions = [[{configure, ConfigureRE}, {write, WriteRE}, {read, ReadRE}]
-        || {PermUser, ConfigureRE, WriteRE, ReadRE} <- Permissions, User =:= PermUser],
+        || {PermUser, ConfigureRE, WriteRE, ReadRE, _Scope} <- Permissions, User =:= PermUser],
     case length(UserPermissions) of
         0 -> [{configure, <<"">>}, {write, <<"">>}, {read, <<"">>}];
         _ -> lists:nth(1, UserPermissions)